-Pdev not anymore needed

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382671 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/README.txt b/README.txt
index b366f1af76af755c3cabf4afb3f9f6810002d9b1..1c4154ae12c76eb0128233aa5fac7c855cce25d8 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -22,9 +22,9 @@ export MAVEN_OPTS="-Xmx768m -Xms768m -XX:MaxPermSize=256m"
 Running webapp full js
 ========================
 As webapp js is in dev and won't probably be released soon, the module is not activated by default and it's included only in a profile
-mvn tomcat7:run -pl :archiva-webapp-js -am -Pdev (to save fingers :-) use sh ./t7.sh )
+mvn tomcat7:run -pl :archiva-webapp-js -am  (to save fingers :-) use sh ./t7.sh )
 or
-mvn tomcat6:run -pl :archiva-webapp-js -am -Pdev
+mvn tomcat6:run -pl :archiva-webapp-js -am 
 
 hit your browser: http://localhost:9091/archiva/index.html
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 5a16f22e5f751f41d383a5a68c0a94570290a60b..2a1f1aa84c4054c8ddc394cb4c7aa621da387b04 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -1014,35 +1014,4 @@
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <!-- profile for dev an log output in the console -->
-      <id>dev</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>override-log4j-with-console-output</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <tasks>
-                    <copy overwrite="true" file="${basedir}/src/test/tomcat/auto-admin-creation.properties"
-                          todir="${project.build.directory}/target/"/>
-                    <copy overwrite="true" file="${basedir}/src/test/tomcat/log4j.xml"
-                          todir="${project.build.outputDirectory}"/>
-                  </tasks>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>

diff --git a/t7-debug.sh b/t7-debug.sh
index 741781a611c44a5a058dc0aab3879a3f1d73c73d..dd42c220eca97b9f1d8924f7d4541086aeb89a78 100644 (file)
--- a/t7-debug.sh
+++ b/t7-debug.sh
@@ -1,2 +1,2 @@
 set -x
-mvnDebug tomcat7:run -pl :archiva-webapp-js -am -Pdev $@
+mvnDebug tomcat7:run -pl :archiva-webapp-js -am  $@

diff --git a/t7.sh b/t7.sh
index ad1c5b9e28d970210ebe26986214cd7dcc79b976..265abe8297d4d395e4b429064b5a5c2d100bb765 100644 (file)
--- a/t7.sh
+++ b/t7.sh
@@ -1,2 +1,2 @@
 set -x
-mvn tomcat7:run -pl :archiva-webapp-js -am -Pdev $@
+mvn tomcat7:run -pl :archiva-webapp-js -am  $@