others fix due to module rename

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

.gitignore

@@ -14,7 +14,7 @@ archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/redback/
 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/lib/
 archiva-modules/archiva-web/archiva-webapp-test/cargo-installs/
 
-archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/classes/
+archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/classes/
 
 *.ipr
 *.iws

README.txt

@@ -10,9 +10,9 @@ Running from Source Code
 ========================
 
 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  (to save fingers :-) use sh ./t7.sh )
+mvn tomcat7:run -pl :archiva-webapp -am  (to save fingers :-) use sh ./t7.sh )
 or
-mvn tomcat6:run -pl :archiva-webapp-js -am 
+mvn tomcat6:run -pl :archiva-webapp -am
 
 hit your browser: http://localhost:9091/archiva/index.html
 

archiva-docs/src/site/apt/adminguide/customising-security.apt

@@ -74,7 +74,7 @@ security.policy.password.rule.nowhitespace.enabled=true
 
   Values from sources
 
-%{snippet|id=configuration-files-list|ignoreDownloadError=true|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml}
+%{snippet|id=configuration-files-list|ignoreDownloadError=true|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml}
 
 
 

archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt

@@ -40,4 +40,4 @@ Repositories Content Storage
 
  If you want to change this default location, you must edit the file WEB-INF/applicationContext.xml, uncomment/edit lines and change with your values:
 
-%{snippet|id=jcr-location|ignoreDownloadError=true|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml}
+%{snippet|id=jcr-location|ignoreDownloadError=true|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml}

archiva-jetty/pom.xml

@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-webapp-js</artifactId>
+      <artifactId>archiva-webapp</artifactId>
       <type>war</type>
     </dependency>
     <!-- Runtime dependencies that need to be included in the generated binaries -->

archiva-jetty/src/main/assembly/bin.xml

@@ -114,7 +114,7 @@
       <unpack>true</unpack>
       <outputDirectory>apps/archiva</outputDirectory>
       <includes>
-        <include>org.apache.archiva:archiva-webapp-js</include>
+        <include>org.apache.archiva:archiva-webapp</include>
       </includes>
       <fileMode>0755</fileMode>
       <directoryMode>0755</directoryMode>

archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml

@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-webapp-js</artifactId>
+      <artifactId>archiva-webapp</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
@@ -271,7 +271,7 @@
                   <artifactItems>
                     <artifactItem>
                       <groupId>${project.groupId}</groupId>
-                      <artifactId>archiva-webapp-js</artifactId>
+                      <artifactId>archiva-webapp</artifactId>
                       <version>${project.version}</version>
                       <type>war</type>
                     </artifactItem>

archiva-modules/archiva-web/archiva-webapp/pom.xml

@@ -24,7 +24,7 @@
     <artifactId>archiva-web</artifactId>
     <version>1.4-M4-SNAPSHOT</version>
   </parent>
-  <artifactId>archiva-webapp-js</artifactId>
+  <artifactId>archiva-webapp</artifactId>
   <packaging>war</packaging>
 
   <name>Archiva Web :: Javascript Application</name>

pom.xml

@@ -419,7 +419,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
-        <artifactId>archiva-webapp-js</artifactId>
+        <artifactId>archiva-webapp</artifactId>
         <version>${project.version}</version>
         <type>war</type>
       </dependency>