You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/12/27 15:55:46 UTC
svn commit: r1426215 - in /archiva/trunk: ./
archiva-docs/src/site/apt/adminguide/ archiva-jetty/
archiva-jetty/src/main/assembly/
archiva-modules/archiva-web/archiva-webapp-test-js/
archiva-modules/archiva-web/archiva-webapp/
Author: olamy
Date: Thu Dec 27 14:55:45 2012
New Revision: 1426215
URL: http://svn.apache.org/viewvc?rev=1426215&view=rev
Log:
others fix due to module rename
Modified:
archiva/trunk/.gitignore
archiva/trunk/README.txt
archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt
archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt
archiva/trunk/archiva-jetty/pom.xml
archiva/trunk/archiva-jetty/src/main/assembly/bin.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/.gitignore
URL: http://svn.apache.org/viewvc/archiva/trunk/.gitignore?rev=1426215&r1=1426214&r2=1426215&view=diff
==============================================================================
--- archiva/trunk/.gitignore (original)
+++ archiva/trunk/.gitignore Thu Dec 27 14:55:45 2012
@@ -14,7 +14,7 @@ archiva-modules/archiva-web/archiva-weba
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
Modified: archiva/trunk/README.txt
URL: http://svn.apache.org/viewvc/archiva/trunk/README.txt?rev=1426215&r1=1426214&r2=1426215&view=diff
==============================================================================
--- archiva/trunk/README.txt (original)
+++ archiva/trunk/README.txt Thu Dec 27 14:55:45 2012
@@ -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
Modified: archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt?rev=1426215&r1=1426214&r2=1426215&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt Thu Dec 27 14:55:45 2012
@@ -74,7 +74,7 @@ security.policy.password.rule.nowhitespa
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}
Modified: archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt?rev=1426215&r1=1426214&r2=1426215&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt Thu Dec 27 14:55:45 2012
@@ -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}
\ No newline at end of file
+%{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}
\ No newline at end of file
Modified: archiva/trunk/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=1426215&r1=1426214&r2=1426215&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Thu Dec 27 14:55:45 2012
@@ -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 -->
Modified: archiva/trunk/archiva-jetty/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/src/main/assembly/bin.xml?rev=1426215&r1=1426214&r2=1426215&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/src/main/assembly/bin.xml (original)
+++ archiva/trunk/archiva-jetty/src/main/assembly/bin.xml Thu Dec 27 14:55:45 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml?rev=1426215&r1=1426214&r2=1426215&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml Thu Dec 27 14:55:45 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1426215&r1=1426214&r2=1426215&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Dec 27 14:55:45 2012
@@ -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>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1426215&r1=1426214&r2=1426215&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Dec 27 14:55:45 2012
@@ -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>