portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r230879 - in /portals/jetspeed-2/trunk: ./ app-servers/security/jboss/ components/capability/ components/deploy-tool/ components/portal/ components/portal/src/test/org/apache/jetspeed/ components/prefs/ components/profiler/ components/regis...
Date Mon, 08 Aug 2005 20:37:22 GMT
Author: ate
Date: Mon Aug  8 13:37:06 2005
New Revision: 230879

URL: http://svn.apache.org/viewcvs?rev=230879&view=rev
Log:
-- Merging JS2-319 (by hand now) --
Removing portal-webapp project:
adjusting references to the webapp folder

Modified:
    portals/jetspeed-2/trunk/app-servers/security/jboss/maven.xml
    portals/jetspeed-2/trunk/components/capability/project.xml
    portals/jetspeed-2/trunk/components/deploy-tool/maven.xml
    portals/jetspeed-2/trunk/components/portal/project.xml
    portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/PortalTestConstants.java
    portals/jetspeed-2/trunk/components/prefs/project.xml
    portals/jetspeed-2/trunk/components/profiler/project.xml
    portals/jetspeed-2/trunk/components/registry/project.xml
    portals/jetspeed-2/trunk/components/security/project.xml
    portals/jetspeed-2/trunk/components/sso/project.xml
    portals/jetspeed-2/trunk/maven.xml
    portals/jetspeed-2/trunk/project.properties

Modified: portals/jetspeed-2/trunk/app-servers/security/jboss/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/security/jboss/maven.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/security/jboss/maven.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/security/jboss/maven.xml Mon Aug  8 13:37:06 2005
@@ -19,7 +19,7 @@
     <goal name="sar:sar" description="Create the deliverable jar file." prereqs="test:test">
 
         <copy todir="${maven.build.dest}/classes/META-INF/jboss-secsvc" overwrite="true">
-        	<fileset dir="../../../portal-webapp/src/webapp/WEB-INF/assembly">
+        	<fileset dir="../../../src/webapp/WEB-INF/assembly">
             	<include name="security-providers.xml" />
             	<include name="security-spi.xml" />            	
             	<include name="transaction.xml" />             	
@@ -162,4 +162,4 @@
         </ant:jar>
     </goal>
 
-</project>
\ No newline at end of file
+</project>

Modified: portals/jetspeed-2/trunk/components/capability/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/capability/project.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/project.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/project.xml Mon Aug  8 13:37:06 2005
@@ -90,7 +90,7 @@
                     <directory>${basedir}/../../etc/db-ojb</directory>
                 </resource>
                 <resource>
-                    <directory>${basedir}/../../portal-webapp/src/webapp/WEB-INF/assembly</directory>
+                    <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
                 </resource>
             </resources>
         </unitTest>

Modified: portals/jetspeed-2/trunk/components/deploy-tool/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/maven.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/maven.xml Mon Aug  8 13:37:06 2005
@@ -17,7 +17,7 @@
 <project default="uberjar" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
 
     <preGoal name="jar:jar">
-        <copy file="../../portal-webapp/src/webapp/WEB-INF/tld/portlet.tld"
+        <copy file="../../src/webapp/WEB-INF/tld/portlet.tld"
             toDir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy" />
     </preGoal>
 

Modified: portals/jetspeed-2/trunk/components/portal/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/project.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/project.xml Mon Aug  8 13:37:06 2005
@@ -58,7 +58,7 @@
                     <directory>${basedir}/../../etc/db-ojb</directory>
                 </resource>
                 <resource>
-                    <directory>${basedir}/../../portal-webapp/src/webapp/WEB-INF/assembly</directory>
+                    <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
                 </resource>
             </resources>
 

Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/PortalTestConstants.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/PortalTestConstants.java?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/PortalTestConstants.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/PortalTestConstants.java
Mon Aug  8 13:37:06 2005
@@ -24,9 +24,9 @@
  */
 public class PortalTestConstants
 {
-    public final static String JETSPEED_PROPERTIES_PATH = "../../portal-webapp/src/webapp/WEB-INF/conf/jetspeed.properties";
+    public final static String JETSPEED_PROPERTIES_PATH = "../../src/webapp/WEB-INF/conf/jetspeed.properties";
     
-    public final static String PORTAL_WEBAPP_PATH = "../../portal-webapp/src/webapp";
+    public final static String PORTAL_WEBAPP_PATH = "../../src/webapp";
     
-    public static final String JETSPEED_APPLICATION_ROOT = "../../portal-webapp/src/webapp";
+    public static final String JETSPEED_APPLICATION_ROOT = "../../src/webapp";
 }

Modified: portals/jetspeed-2/trunk/components/prefs/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/project.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/project.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/project.xml Mon Aug  8 13:37:06 2005
@@ -92,7 +92,7 @@
                     <directory>${basedir}/../../etc/db-ojb</directory>
                 </resource>
                 <resource>
-                    <directory>${basedir}/../../portal-webapp/src/webapp/WEB-INF/assembly</directory>
+                    <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
                 </resource>
             </resources>
         </unitTest>

Modified: portals/jetspeed-2/trunk/components/profiler/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/project.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/project.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/project.xml Mon Aug  8 13:37:06 2005
@@ -94,7 +94,7 @@
                     <directory>${basedir}/../../etc/db-ojb</directory>
                 </resource>
                 <resource>
-                    <directory>${basedir}/../../portal-webapp/src/webapp/WEB-INF/assembly</directory>
+                    <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
                 </resource>
             </resources>
         </unitTest>

Modified: portals/jetspeed-2/trunk/components/registry/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/project.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/project.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/project.xml Mon Aug  8 13:37:06 2005
@@ -110,7 +110,7 @@
                     <directory>${basedir}/../../etc/db-ojb</directory>
                 </resource>
                 <resource>
-                    <directory>${basedir}/../../portal-webapp/src/webapp/WEB-INF/assembly</directory>
+                    <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
                 </resource>
             </resources>
         </unitTest>

Modified: portals/jetspeed-2/trunk/components/security/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/project.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/project.xml (original)
+++ portals/jetspeed-2/trunk/components/security/project.xml Mon Aug  8 13:37:06 2005
@@ -109,7 +109,7 @@
                     <directory>${basedir}/../../etc/db-ojb</directory>
                 </resource>
 				<resource>
-                    <directory>${basedir}/../../portal-webapp/src/webapp/WEB-INF/assembly</directory>
+                    <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
                 </resource>
             </resources>
         </unitTest>

Modified: portals/jetspeed-2/trunk/components/sso/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/project.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/project.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/project.xml Mon Aug  8 13:37:06 2005
@@ -114,7 +114,7 @@
                     <directory>${basedir}/../../etc/db-ojb</directory>
                 </resource>
                 <resource>
-                    <directory>${basedir}/../../portal-webapp/src/webapp/WEB-INF/assembly</directory>
+                    <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
                 </resource>
             </resources>
         </unitTest>

Modified: portals/jetspeed-2/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven.xml?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven.xml Mon Aug  8 13:37:06 2005
@@ -80,14 +80,14 @@
 
     <goal name="allTest" description="Test all components">
         <j:set var="maven.test.skip" value="false" scope="parent" />
-        <maven:reactor basedir="${basedir}" includes="portal-webapp/project.xml,components/*/project.xml"
+        <maven:reactor basedir="${basedir}" includes="components/*/project.xml"
             excludes="applications/project.xml" goals="test" banner="Testing..." ignoreFailures="false"
/>
     </goal>
 
     <goal name="subClean" description="Clean all subprojects">
 
         <maven:reactor basedir="${basedir}"
-            includes="*/project.xml,applications/*/project.xml,services/*/project.xml,components/*/project.xml,portal-webapp/project.xml"
+            includes="*/project.xml,applications/*/project.xml,services/*/project.xml,components/*/project.xml"
             excludes="applications/project.xml,taglibs/project.xml,portals-bridges/project.xml"
goals="clean"
             banner="Cleaning" ignoreFailures="true" />
         <maven:reactor basedir="${basedir}"

Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=230879&r1=230878&r2=230879&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Mon Aug  8 13:37:06 2005
@@ -82,7 +82,7 @@
 maven.multiproject.aggregateDir=multiproject/
 maven.multiproject.ignoreFailures=false
 
-jar.includes=applications/gems/project.xml,portlet-api/project.xml,commons/project.xml,cps/project.xml,content-server/project.xml,jetspeed-api/project.xml,portal-webapp/project.xml,components/**/project.xml,taglibs/treecontrol/project.xml
+jar.includes=applications/gems/project.xml,portlet-api/project.xml,commons/project.xml,cps/project.xml,content-server/project.xml,jetspeed-api/project.xml,components/**/project.xml,taglibs/treecontrol/project.xml
 jar.excludes=/project.xml,maven-plugin/**,layout-portlets/**,applications/project.xml,applications/demo/**,applications/jsf-demo/**,applications/localeselector/**,applications/palm/**,applications/pam/**,applications/perl/**,applications/php/**,applications/rss/**,applications/security/**,applications/struts-demo/**,,applications/jpetstore/**site/project.xml,design-docs/project.xml
 
 maven.multiproject.site.goals=site pdf dashboard:report-single



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message