continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r516053 - in /maven/continuum/trunk: continuum-plexus-runtime/ continuum-plexus-runtime/src/main/appserver/ continuum-plexus-runtime/src/main/appserver/conf/ continuum-webapp/ continuum-webapp/src/appserver-base/ continuum-webapp/src/appser...
Date Thu, 08 Mar 2007 14:30:35 GMT
Author: evenisse
Date: Thu Mar  8 06:30:34 2007
New Revision: 516053

URL: http://svn.apache.org/viewvc?view=rev&rev=516053
Log:
[CONTINUUM-1203] Fix NPE when the config file doesn't exist in user directory

Added:
    maven/continuum/trunk/continuum-plexus-runtime/src/main/appserver/
    maven/continuum/trunk/continuum-plexus-runtime/src/main/appserver/conf/
    maven/continuum/trunk/continuum-plexus-runtime/src/main/appserver/conf/shared.xml   (with
props)
    maven/continuum/trunk/continuum-webapp/src/appserver-base/
    maven/continuum/trunk/continuum-webapp/src/appserver-base/conf/
    maven/continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml   (with props)
Modified:
    maven/continuum/trunk/continuum-plexus-runtime/pom.xml
    maven/continuum/trunk/continuum-webapp/pom.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml

Modified: maven/continuum/trunk/continuum-plexus-runtime/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-plexus-runtime/pom.xml?view=diff&rev=516053&r1=516052&r2=516053
==============================================================================
--- maven/continuum/trunk/continuum-plexus-runtime/pom.xml (original)
+++ maven/continuum/trunk/continuum-plexus-runtime/pom.xml Thu Mar  8 06:30:34 2007
@@ -143,6 +143,25 @@
           <finalName>continuum</finalName>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>config</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <copy todir="target/plexus-continuum-runtime/conf">
+                  <fileset dir="src/main/appserver/conf" />
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

Added: maven/continuum/trunk/continuum-plexus-runtime/src/main/appserver/conf/shared.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-plexus-runtime/src/main/appserver/conf/shared.xml?view=auto&rev=516053
==============================================================================
--- maven/continuum/trunk/continuum-plexus-runtime/src/main/appserver/conf/shared.xml (added)
+++ maven/continuum/trunk/continuum-plexus-runtime/src/main/appserver/conf/shared.xml Thu
Mar  8 06:30:34 2007
@@ -0,0 +1 @@
+<configuration />

Propchange: maven/continuum/trunk/continuum-plexus-runtime/src/main/appserver/conf/shared.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-plexus-runtime/src/main/appserver/conf/shared.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?view=diff&rev=516053&r1=516052&r2=516053
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Thu Mar  8 06:30:34 2007
@@ -227,6 +227,24 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <copy todir="${project.build.directory}/appserver-base">
+                  <fileset dir="src/appserver-base" />
+                </copy>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -237,7 +255,7 @@
     <dependency>
       <groupId>org.codehaus.plexus.registry</groupId>
       <artifactId>plexus-registry-commons</artifactId>
-      <version>1.0-alpha-1</version>
+      <version>1.0-alpha-2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

Added: maven/continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml?view=auto&rev=516053
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml (added)
+++ maven/continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml Thu Mar  8 06:30:34
2007
@@ -0,0 +1 @@
+<configuration />

Propchange: maven/continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=516053&r1=516052&r2=516053
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
Thu Mar  8 06:30:34 2007
@@ -59,7 +59,7 @@
           <xml fileName="${user.home}/.m2/continuum.xml" config-optional="true" config-name="org.apache.maven.continuum"
                config-at="org.apache.maven.continuum" config-forceCreate="true"/>
           <xml fileName="${user.home}/.m2/shared.xml" config-optional="true"
-               config-name="org.apache.maven.shared.app" config-at="org.apache.maven.shared.app"
+               config-name="org.apache.maven.shared.app.user" config-at="org.apache.maven.shared.app"
                config-forceCreate="true"/>
           <properties fileName="${user.home}/.m2/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.security"/>
@@ -67,11 +67,15 @@
                       config-at="org.codehaus.plexus.security"/>
           <xml fileName="${appserver.base}/conf/continuum.xml" config-optional="true"
                config-at="org.apache.maven.continuum"/>
+          <xml fileName="${appserver.base}/conf/shared.xml" config-optional="true"
+               config-name="org.apache.maven.shared.app.base" config-at="org.apache.maven.shared.app"/>
           <xml fileName="${appserver.base}/conf/common.xml" config-optional="true"/>
           <properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.security"/>
           <xml fileName="${appserver.home}/conf/continuum.xml" config-optional="true"
                config-at="org.apache.maven.continuum"/>
+          <xml fileName="${appserver.home}/conf/shared.xml" config-optional="true"
+               config-at="org.apache.maven.shared.app"/>
           <xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>
           <properties fileName="${appserver.home}/conf/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.security"/>



Mime
View raw message