portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlest...@apache.org
Subject svn commit: r209405 [1/3] - in /portals/jetspeed-2/trunk: ./ layout-portlets/ maven-plugin/ portal-webapp/
Date Wed, 06 Jul 2005 03:30:41 GMT
Author: dlestrat
Date: Tue Jul  5 20:30:40 2005
New Revision: 209405

URL: http://svn.apache.org/viewcvs?rev=209405&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-304

Modified:
    portals/jetspeed-2/trunk/.classpath
    portals/jetspeed-2/trunk/.project
    portals/jetspeed-2/trunk/layout-portlets/project.xml
    portals/jetspeed-2/trunk/maven-plugin/maven.xml
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
    portals/jetspeed-2/trunk/maven-plugin/plugin.properties
    portals/jetspeed-2/trunk/maven.xml
    portals/jetspeed-2/trunk/portal-webapp/maven.xml
    portals/jetspeed-2/trunk/portal-webapp/project.xml
    portals/jetspeed-2/trunk/project.properties

Modified: portals/jetspeed-2/trunk/.classpath
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/.classpath?rev=209405&r1=209404&r2=209405&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/.classpath (original)
+++ portals/jetspeed-2/trunk/.classpath Tue Jul  5 20:30:40 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="**/.svn/*" kind="src" path="src/java"/>
-	<classpathentry excluding="**/.svn/*|log4j.properties" kind="src" path="components/rewriter/src/java"/>
-	<classpathentry excluding="**/.svn/*|log4j.properties" kind="src" path="components/rewriter/src/test"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="portlet-api/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="jetspeed-api/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="commons/src/java"/>
@@ -22,6 +20,8 @@
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/page-manager/src/test"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/persistence/src/java"/>
 	<classpathentry excluding="**/.svn/*|log4j.properties" kind="src" path="components/persistence/src/test"/>
+	<classpathentry excluding="**/.svn/*" kind="src" path="components/portal/src/java"/>
+	<classpathentry excluding="**/.svn/*" kind="src" path="components/portal/src/test"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/portlet-factory/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/prefs/src/java"/>
 	<classpathentry excluding="**/.svn/*|Log4j.properties" kind="src" path="components/prefs/src/test"/>
@@ -29,6 +29,8 @@
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/profiler/src/test"/>
 	<classpathentry excluding="**/.svn/*|META-INF/transaction.xml" kind="src" path="components/registry/src/java"/>
 	<classpathentry excluding="**/.svn/*|Log4j.properties" kind="src" path="components/registry/src/test"/>
+	<classpathentry excluding="**/.svn/*|log4j.properties" kind="src" path="components/rewriter/src/java"/>
+	<classpathentry excluding="**/.svn/*|log4j.properties" kind="src" path="components/rewriter/src/test"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/rdbms/src/java"/>
 	<classpathentry excluding="**/.svn/*|Log4j.properties" kind="src" path="components/rdbms/src/test"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/search/src/java"/>
@@ -46,8 +48,6 @@
 	<classpathentry excluding="**/.svn/*" kind="src" path="portals-bridges/perl/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="portals-bridges/struts/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="portals-bridges/velocity/src/java"/>
-	<classpathentry excluding="**/.svn/*" kind="src" path="portal/src/java"/>
-	<classpathentry excluding="**/.svn/*" kind="src" path="portal/src/test"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="content-server/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="layout-portlets/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="taglibs/treecontrol/src/java"/>

Modified: portals/jetspeed-2/trunk/.project
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/.project?rev=209405&r1=209404&r2=209405&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/.project (original)
+++ portals/jetspeed-2/trunk/.project Tue Jul  5 20:30:40 2005
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jetspeed-2</name>
+	<name>jetspeed-2-svn</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.sse.model.structuredbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

Modified: portals/jetspeed-2/trunk/layout-portlets/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/project.xml?rev=209405&r1=209404&r2=209405&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/project.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/project.xml Tue Jul  5 20:30:40 2005
@@ -3,130 +3,146 @@
   <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
 ]>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-  $Id$
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    
+    $Id$
 -->
 <project>
-  <extend>${basedir}/../project.xml</extend>
-  <id>jetspeed2-layout-portlets</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Layout Portlets</name>
-  <description>Layout  Portlets</description>
-  <shortDescription>Layouts.</shortDescription>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/layout-portlets</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/layout-portlets</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/layout-portlets/</url>
-  </repository>
-
-  <dependencies>
-      <dependency>
-      <id>portlet-api</id>
-        <version>1.0</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-      
-      &pluto-deps;
-      
-    <dependency>
-      <id>servletapi</id>
-      <version>2.3</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>velocity</id>
-      <version>1.4-rc1</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-     </dependency>
-     <dependency>
-      <id>servletapi</id>
-      <version>2.3</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties> 
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-commons</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-api</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-cm</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-registry</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>portals-bridges-common</id>
-      <groupId>portals-bridges</groupId>
-      <version>&portals-bridges-common-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>portals-bridges-velocity</id>
-      <groupId>portals-bridges</groupId>
-      <version>&portals-bridges-velocity-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-
-   </dependencies>
-
-
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-  </build>
-
-  <reports>
-  
-  	&j2-reports;
-  
-  </reports>  
+    <extend>${basedir}/../project.xml</extend>
+    <id>jetspeed-layouts</id>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Layout Portlets</name>
+    <description>Layout Portlets</description>
+    <shortDescription>Layouts.</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/layout-portlets</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/layout-portlets
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/layout-portlets/</url>
+    </repository>
+
+    <dependencies>
+        <dependency>
+            <id>portlet-api</id>
+            <version>1.0</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+
+        &pluto-deps;
+
+        <dependency>
+            <id>servletapi</id>
+            <version>2.3</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>velocity</id>
+            <version>1.4-rc1</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>servletapi</id>
+            <version>2.3</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-commons</id>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-cm</id>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-registry</id>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-portal</id>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>portals-bridges-common</id>
+            <groupId>portals-bridges</groupId>
+            <version>
+                &portals-bridges-common-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>portals-bridges-velocity</id>
+            <groupId>portals-bridges</groupId>
+            <version>
+                &portals-bridges-velocity-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+    </dependencies>
+
+
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+    </build>
+
+    <reports>
+
+        &j2-reports;
+
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/maven-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/maven.xml?rev=209405&r1=209404&r2=209405&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/maven.xml Tue Jul  5 20:30:40 2005
@@ -3,183 +3,192 @@
   <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
 ]>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-  $Id$
--->
-<project default="java:jar"
-         xmlns:j="jelly:core"
-         xmlns:maven="jelly:maven"
-         xmlns:artifact="artifact"
-         xmlns:ant="jelly:ant"
-         xmlns:util="jelly:util">
-         
- <preGoal name="java:jar-resources">
-   <copy file="../etc/artifact-versions.ent" tofile="${basedir}/target/classes/plugin-resources/etc/artifact-versions.ent" overwrite="true" failonerror="true"/> 
- 	 <copy todir="target/classes/plugin-resources/etc/project-dependencies" overwrite="true" failonerror="true">
-         <fileset dir="../etc/project-dependencies" />
-     </copy>
-     <copy todir="target/classes/plugin-resources/etc/project-resources" overwrite="true" failonerror="true">
-         <fileset dir="../etc/project-resources" />              	       	       
-     </copy>
-     <copy todir="target/classes/plugin-resources/etc/project-reports" overwrite="true" failonerror="true">
-         <fileset dir="../etc/project-reports" />   
-     </copy>
-     <copy file="../locator.ent" tofile="${basedir}/target/classes/plugin-resources/locator.ent" overwrite="true" failonerror="true"/> 
-     <copy file="../locator.path" tofile="${basedir}/target/classes/plugin-resources/locator.path" overwrite="true" failonerror="true"/> 
- 	 <attainGoal name="copyDb" />
- 	 <attainGoal name="copyPortlaWebApp" />
-     <copy file="../portal/project.xml" tofile="${basedir}/target/classes/plugin-resources/portal_project.xml" overwrite="true" failonerror="true"/> 
-     <copy file="plugin.properties" tofile="${basedir}/target/classes/plugin.properties" overwrite="true" failonerror="true">
-       <filterset begintoken="@" endtoken="@">
-          <filter token="JETSPEED_VERSION" value="&jetspeed-version;"/>
-        </filterset>
-     </copy> 
-      
- </preGoal>        
- 
-
- 
-  <goal name="deploy-plugin">
-  	<attainGoal name="undeploy-plugin" />
-  	
-  	<!-- install will do the uninstall if needed for us -->
-    <attainGoal name="plugin:install"/> 
-    <!-- get the plugin available now (like with plugin:install-now, but which doesn't install).
-         Bug: If a new version of the plugin is deployed while an older version is available
-              maven gets very confused... Haven't found a workaround for that.
-    -->
     
-    <!-- deploy the plugin to the local repository directly: 
-         using the plugin:repository-install goal would lead to another build of the jar as all plugin goals do that as 
-         prereq
-    -->    
-    <maven:installPlugin file="${maven.build.dir}/${maven.final.name}.jar" cache="true" />
-      <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar" type="plugin" project="${pom}"/>
-    <unjar src="${maven.build.dir}/${maven.final.name}.jar" dest="${maven.home.local}/plugins/${maven.final.name}" overwrite="true" />
-
-  </goal>
-  
-  <goal name="undeploy-plugin">
-  	<attainGoal name="plugin:uninstall-now" />
-  	<delete dir="${maven.home.local}/plugins/${maven.final.name}" verbose="false" />  
-  </goal>
-  
-   <goal name="copyDb">
-	 <copy todir="target/classes/plugin-resources" overwrite="true" failonerror="true">
-         <fileset dir="../src/database/hsql" >         	
-         	<include name="Empty.script"/>
-         	<include name="Production.properties"/>
-         </fileset>
-    </copy>
-     
-     
-    <copy todir="target/classes/plugin-resources/" overwrite="true" failonerror="true">
-     <fileset dir="../target/src/sql" >   
-         <exclude name="**/test-persistence-schema.sql" />            
-         <include name="**/*.sql" />
-     </fileset>          	       	       
-    </copy>
-     
-     <copy todir="target/classes/plugin-resources/" overwrite="true" failonerror="true">
-         <fileset dir="../src/sql/" >
-         	 <include name="*.sql" />
-         </fileset>          	       	       
-     </copy>
-
-     <copy todir="target/classes/plugin-resources/hsql/drop/" overwrite="true" failonerror="true">
-         <fileset dir="../src/sql/hsql/" >
-         	 <include name="drop.sql" />
-         </fileset>          	       	       
-    </copy>         
-
-     <copy todir="target/classes/plugin-resources/mysql/drop/" overwrite="true" failonerror="true">                 
-         <fileset dir="../src/sql/mysql/" >
-         	 <include name="drop.sql" />
-         </fileset>          	     
-    </copy>
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
     
-     <copy todir="target/classes/plugin-resources/oracle/drop/" overwrite="true" failonerror="true">                   	       
-         <fileset dir="../src/sql/oracle/" >
-         	 <include name="drop.sql" />
-         </fileset>          	       	                
-    </copy>
-
-    <util:file name="${basedir}/../src/sql" var="sqlSrcDir"/>
-    <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlSrcDirFile">
-      <util:file name="${basedir}/../src/sql/${sqlSrcDirFile.name}/populate-userinfo-for-default-psml.sql" var="dbSpecificPopulateScript"/>
-      <j:if test="${dbSpecificPopulateScript.exists()}">
-        <copy file="${dbSpecificPopulateScript.absolutePath}" toDir="target/classes/plugin-resources/${sqlSrcDirFile.name}/populate"/>
-      </j:if>
-    </j:forEach>
-
-     <!--
-     <move file="${basedir}/target/classes/plugin-resources/Empty.script" tofile="${basedir}/target/classes/plugin-resources/Production.script" overwrite="true"/>
-	 <echo>Initializing HSQL Production.script with basic portal info.......</echo>
-	<j:set var="org.apache.jetspeed.database.url" value="jdbc:hsqldb:target/classes/plugin-resources/Production"/>
-    <j:set var="org.apache.jetspeed.database.driver" value="org.hsqldb.jdbcDriver"/>
-    <j:set var="org.apache.jetspeed.database.user" value="sa"/>
-    <j:set var="org.apache.jetspeed.database.password" value=""/>
-    <j:set var="org.apache.jetspeed.database.default.name" value="hsql" />
-    <attainGoal name="db.create" />	 
-    -->
-</goal>
-
-<goal name="copyPortlaWebApp">
-	 <copy todir="target/classes/plugin-resources/webapp" overwrite="true" failonerror="true">
-         <fileset dir="../portal/src/webapp" >
-            <exclude name="**/WEB-INF/pages/*"/>
-         </fileset>            	       	       
-     </copy>
-     <copy todir="target/classes/plugin-resources/" overwrite="true" failonerror="true">
-         <fileset dir="../portal/src/resources" />            	       	       
-     </copy>
-     <copy file="../layout-portlets/target/jetspeed-layouts.war" todir="target/classes/plugin-resources/webapp/WEB-INF/deploy" overwrite="true" failonerror="true" />
-
-</goal>
-
-  <goal name="db.execute">
-    <sql driver="${org.apache.jetspeed.database.driver}"
-         url="${org.apache.jetspeed.database.url}"
-         userid="${org.apache.jetspeed.database.user}"
-         password="${org.apache.jetspeed.database.password}"
-         src="${database.arg.script}">
-      <classpath>
-        <path refid="maven.dependency.classpath"/>
-        <pathelement path="${org.apache.jetspeed.jdbc.drivers.path}"/>
-      </classpath>
-    </sql>
-  </goal>
-  
+    $Id$
+-->
+<project default="java:jar" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:artifact="artifact"
+    xmlns:ant="jelly:ant" xmlns:util="jelly:util">
+
+    <preGoal name="java:jar-resources">
+        <copy file="../etc/artifact-versions.ent"
+            tofile="${basedir}/target/classes/plugin-resources/etc/artifact-versions.ent" overwrite="true"
+            failonerror="true" />
+        <copy todir="target/classes/plugin-resources/etc/project-dependencies" overwrite="true" failonerror="true">
+            <fileset dir="../etc/project-dependencies" />
+        </copy>
+        <copy todir="target/classes/plugin-resources/etc/project-resources" overwrite="true" failonerror="true">
+            <fileset dir="../etc/project-resources" />
+        </copy>
+        <copy todir="target/classes/plugin-resources/etc/project-reports" overwrite="true" failonerror="true">
+            <fileset dir="../etc/project-reports" />
+        </copy>
+        <copy file="../locator.ent" tofile="${basedir}/target/classes/plugin-resources/locator.ent" overwrite="true"
+            failonerror="true" />
+        <copy file="../locator.path" tofile="${basedir}/target/classes/plugin-resources/locator.path" overwrite="true"
+            failonerror="true" />
+        <attainGoal name="copyDb" />
+        <attainGoal name="copyPortlaWebApp" />
+        <copy file="../portal-webapp/project.xml" tofile="${basedir}/target/classes/plugin-resources/portal_project.xml"
+            overwrite="true" failonerror="true" />
+        <copy file="plugin.properties" tofile="${basedir}/target/classes/plugin.properties" overwrite="true"
+            failonerror="true">
+            <filterset begintoken="@" endtoken="@">
+                <filter token="JETSPEED_VERSION" value="&jetspeed-version;" />
+            </filterset>
+        </copy>
+
+    </preGoal>
+
+
+
+    <goal name="deploy-plugin">
+        <attainGoal name="undeploy-plugin" />
+
+        <!-- install will do the uninstall if needed for us -->
+        <attainGoal name="plugin:install" />
+        <!-- get the plugin available now (like with plugin:install-now, but which doesn't install).
+            Bug: If a new version of the plugin is deployed while an older version is available
+            maven gets very confused... Haven't found a workaround for that.
+        -->
+
+        <!-- deploy the plugin to the local repository directly: 
+            using the plugin:repository-install goal would lead to another build of the jar as all plugin goals do that as 
+            prereq
+        -->
+        <maven:installPlugin file="${maven.build.dir}/${maven.final.name}.jar" cache="true" />
+        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar" type="plugin" project="${pom}" />
+        <unjar src="${maven.build.dir}/${maven.final.name}.jar" dest="${maven.home.local}/plugins/${maven.final.name}"
+            overwrite="true" />
+
+    </goal>
+
+    <goal name="undeploy-plugin">
+        <attainGoal name="plugin:uninstall-now" />
+        <delete dir="${maven.home.local}/plugins/${maven.final.name}" verbose="false" />
+    </goal>
+
+    <goal name="copyDb">
+        <copy todir="target/classes/plugin-resources" overwrite="true" failonerror="true">
+            <fileset dir="../src/database/hsql">
+                <include name="Empty.script" />
+                <include name="Production.properties" />
+            </fileset>
+        </copy>
+
+
+        <copy todir="target/classes/plugin-resources/" overwrite="true" failonerror="true">
+            <fileset dir="../target/src/sql">
+                <exclude name="**/test-persistence-schema.sql" />
+                <include name="**/*.sql" />
+            </fileset>
+        </copy>
+
+        <copy todir="target/classes/plugin-resources/" overwrite="true" failonerror="true">
+            <fileset dir="../src/sql/">
+                <include name="*.sql" />
+            </fileset>
+        </copy>
+
+        <copy todir="target/classes/plugin-resources/hsql/drop/" overwrite="true" failonerror="true">
+            <fileset dir="../src/sql/hsql/">
+                <include name="drop.sql" />
+            </fileset>
+        </copy>
+
+        <copy todir="target/classes/plugin-resources/mysql/drop/" overwrite="true" failonerror="true">
+            <fileset dir="../src/sql/mysql/">
+                <include name="drop.sql" />
+            </fileset>
+        </copy>
+
+        <copy todir="target/classes/plugin-resources/oracle/drop/" overwrite="true" failonerror="true">
+            <fileset dir="../src/sql/oracle/">
+                <include name="drop.sql" />
+            </fileset>
+        </copy>
+
+        <util:file name="${basedir}/../src/sql" var="sqlSrcDir" />
+        <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlSrcDirFile">
+            <util:file name="${basedir}/../src/sql/${sqlSrcDirFile.name}/populate-userinfo-for-default-psml.sql"
+                var="dbSpecificPopulateScript" />
+            <j:if test="${dbSpecificPopulateScript.exists()}">
+                <copy file="${dbSpecificPopulateScript.absolutePath}"
+                    toDir="target/classes/plugin-resources/${sqlSrcDirFile.name}/populate" />
+            </j:if>
+        </j:forEach>
+
+        <!--
+            <move file="${basedir}/target/classes/plugin-resources/Empty.script" tofile="${basedir}/target/classes/plugin-resources/Production.script" overwrite="true"/>
+            <echo>Initializing HSQL Production.script with basic portal info.......</echo>
+            <j:set var="org.apache.jetspeed.database.url" value="jdbc:hsqldb:target/classes/plugin-resources/Production"/>
+            <j:set var="org.apache.jetspeed.database.driver" value="org.hsqldb.jdbcDriver"/>
+            <j:set var="org.apache.jetspeed.database.user" value="sa"/>
+            <j:set var="org.apache.jetspeed.database.password" value=""/>
+            <j:set var="org.apache.jetspeed.database.default.name" value="hsql" />
+            <attainGoal name="db.create" />	 
+        -->
+    </goal>
+
+    <goal name="copyPortlaWebApp">
+        <copy todir="target/classes/plugin-resources/webapp" overwrite="true" failonerror="true">
+            <fileset dir="../portal-webapp/src/webapp">
+                <exclude name="**/WEB-INF/pages/*" />
+            </fileset>
+        </copy>
+        <copy todir="target/classes/plugin-resources/" overwrite="true" failonerror="true">
+            <fileset dir="../portal-webapp/src/resources" />
+        </copy>
+        <copy file="${maven.repo.local}/${pom.groupId}/wars/jetspeed-layouts-&jetspeed-version;.war"
+            tofile="${org.apache.jetspeed.portal.dir}/WEB-INF/deploy/jetspeed-layouts.war" overwrite="true" failonerror="true" />
+    </goal>
+
+    <goal name="db.execute">
+        <sql driver="${org.apache.jetspeed.database.driver}" url="${org.apache.jetspeed.database.url}"
+            userid="${org.apache.jetspeed.database.user}" password="${org.apache.jetspeed.database.password}"
+            src="${database.arg.script}">
+            <classpath>
+                <path refid="maven.dependency.classpath" />
+                <pathelement path="${org.apache.jetspeed.jdbc.drivers.path}" />
+            </classpath>
+        </sql>
+    </goal>
+
     <goal name="db.create">
-    <j:set var="database.arg.script" value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/phase3ojb-schema.sql" />
-    <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/phase1-schema.sql" />
-    <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/phase2-schema.sql" />
-    <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/registry-schema.sql" />
-    <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/prefs-schema.sql" />
-    <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/security-schema.sql" />
-    <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/classes/plugin-resources/populate-db-default.sql" />
-    <attainGoal name="db.execute" />
-   </goal>
-  
+        <j:set var="database.arg.script"
+            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/phase3ojb-schema.sql" />
+        <attainGoal name="db.execute" />
+        <j:set var="database.arg.script"
+            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/phase1-schema.sql" />
+        <attainGoal name="db.execute" />
+        <j:set var="database.arg.script"
+            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/phase2-schema.sql" />
+        <attainGoal name="db.execute" />
+        <j:set var="database.arg.script"
+            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/registry-schema.sql" />
+        <attainGoal name="db.execute" />
+        <j:set var="database.arg.script"
+            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/prefs-schema.sql" />
+        <attainGoal name="db.execute" />
+        <j:set var="database.arg.script"
+            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/security-schema.sql" />
+        <attainGoal name="db.execute" />
+        <j:set var="database.arg.script" value="./target/classes/plugin-resources/populate-db-default.sql" />
+        <attainGoal name="db.execute" />
+    </goal>
+
+
 
-  
 </project>

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=209405&r1=209404&r2=209405&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Tue Jul  5 20:30:40 2005
@@ -1,59 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
-<project default="java:jar"
-         xmlns:j="jelly:core"
-         xmlns:define="jelly:define"
-         xmlns:maven="jelly:maven"
-         xmlns:ant="jelly:ant"
-         xmlns:util="jelly:util">
-
-  <goal name="jetspeed2:deploy">
- 	 <copy file="${maven.build.dir}/${maven.war.final.name}" todir="${org.apache.jetspeed.portal.dir}/WEB-INF/deploy" overwrite="true" failonerror="true" />
-  </goal>	
-
-  <goal name="jetspeed2:register">
-  	<j:if test="${!maven.war.final.name.startsWith('jetspeed-')}">
-  		<echo>Register requires that the WAR be prefixed with "jetspeed-".  Appending prefix now.</echo>  	 	
-  	 	<copy file="${maven.build.dir}/${maven.war.final.name}" tofile="${maven.build.dir}/jetspeed-${maven.war.final.name}" overwrite="true" failonerror="true"/>
-  	 	<j:set var="maven.war.final.name" value="jetspeed-${maven.war.final.name}"/>	
-     </j:if>  	
-     <attainGoal name="jetspeed2:deploy" />
-  </goal>
-
-  <goal name="jetspeed2:unregister">
-  	 	<j:if test="${!maven.war.final.name.startsWith('jetspeed-')}">
-  	 		<j:set var="maven.war.final.name" value="jetspeed-${maven.war.final.name}"/>
-        </j:if>  	
-  	    <attainGoal name="jetspeed2:undeploy" />
-  </goal>
-
-  <goal name="jetspeed2:undeploy">
- 	 <delete file="${org.apache.jetspeed.portal.dir}/WEB-INF/deploy/${maven.war.final.name}"/>
-  </goal>
-
-  <goal name="jetspeed2:start.hsql">
-  	<echo message="====================================" />
-  	<echo message="  Starting HSQL Db    " />
-  	<echo message="====================================" />
-         <java classname="org.hsqldb.Server" fork="yes">
-          <classpath>
-            <path refid="maven.dependency.classpath"/>
-            <pathelement path="${maven.build.dest}"/>
-            <pathelement path="${plugin.getDependencyPath('hsqldb')}"/>
-          </classpath>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven"
+    xmlns:ant="jelly:ant" xmlns:util="jelly:util">
+
+    <goal name="jetspeed2:deploy">
+        <copy file="${maven.repo.local}/${pom.groupId}/wars/${maven.war.final.name}-${jetspeed.version}.war"
+            tofile="${org.apache.jetspeed.portal.dir}/WEB-INF/deploy/${maven.war.final.name}.war"
+            overwrite="true" failonerror="true" />
+    </goal>
+
+    <goal name="jetspeed2:undeploy">
+        <delete file="${org.apache.jetspeed.portal.dir}/WEB-INF/deploy/${maven.war.final.name}.war" />
+    </goal>
+
+    <goal name="jetspeed2:start.hsql">
+        <echo message="====================================" />
+        <echo message="  Starting HSQL Db    " />
+        <echo message="====================================" />
+        <java classname="org.hsqldb.Server" fork="yes">
+            <classpath>
+                <path refid="maven.dependency.classpath" />
+                <pathelement path="${maven.build.dest}" />
+                <pathelement path="${plugin.getDependencyPath('hsqldb')}" />
+            </classpath>
             <arg value="-database" />
             <arg value="${org.apache.jetspeed.plugin.production.db}" />
             <arg value="-port" />
@@ -63,309 +46,345 @@
             <arg value="-trace" />
             <arg value="false" />
         </java>
-  </goal>
-  
-  
-  
-  <goal name="jetspeed2:db.execute">
-  	<echo>Execing SQL: ${database.arg.script}</echo>
-    <sql driver="${org.apache.jetspeed.production.database.driver}"
-         url="${org.apache.jetspeed.production.database.url}"
-         userid="${org.apache.jetspeed.production.database.user}"
-         password="${org.apache.jetspeed.production.database.password}"
-         src="${database.arg.script}">
-      <classpath>
-        <path refid="maven.dependency.classpath"/>
-        <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
-        <pathelement path="${plugin.getDependencyPath('hsqldb')}"/>
-      </classpath>
-    </sql>
-  </goal>
-  
-  <goal name="jetspeed2:db.create">
-  	<echo>Using DB: ${org.apache.jetspeed.production.database.default.name}</echo>
-  	<echo>*************************************</echo>
-    <echo>*   Executing standard SQL scripts   *</echo>
-    <echo>*************************************</echo>
-
-    <!-- Run standard DB-specific Drops -->    
-    <util:file name="${org.apache.jetspeed.plugin.root}/plugin-resources/${org.apache.jetspeed.production.database.default.name}/drop" var="sqlSrcDir"/>
-    <j:if test="${sqlSrcDir.exists()}">
-      <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlFile">
-        <j:if test="${sqlFile.name.endsWith('.sql')}">
-          <j:set var="database.arg.script" value="${sqlFile.absolutePath}" />
-          <attainGoal name="jetspeed2:db.execute" />
+    </goal>
+
+    <goal name="jetspeed2:db.execute">
+        <echo>Execing SQL: ${database.arg.script}</echo>
+        <sql driver="${org.apache.jetspeed.production.database.driver}"
+            url="${org.apache.jetspeed.production.database.url}"
+            userid="${org.apache.jetspeed.production.database.user}"
+            password="${org.apache.jetspeed.production.database.password}" src="${database.arg.script}">
+            <classpath>
+                <path refid="maven.dependency.classpath" />
+                <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}" />
+                <pathelement path="${plugin.getDependencyPath('hsqldb')}" />
+            </classpath>
+        </sql>
+    </goal>
+
+    <goal name="jetspeed2:db.create">
+        <echo>Using DB: ${org.apache.jetspeed.production.database.default.name}</echo>
+        <echo>*************************************</echo>
+        <echo>* Executing standard SQL scripts *</echo>
+        <echo>*************************************</echo>
+
+        <!-- Run standard DB-specific Drops -->
+        <util:file
+            name="${org.apache.jetspeed.plugin.root}/plugin-resources/${org.apache.jetspeed.production.database.default.name}/drop"
+            var="sqlSrcDir" />
+        <j:if test="${sqlSrcDir.exists()}">
+            <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlFile">
+                <j:if test="${sqlFile.name.endsWith('.sql')}">
+                    <j:set var="database.arg.script" value="${sqlFile.absolutePath}" />
+                    <attainGoal name="jetspeed2:db.execute" />
+                </j:if>
+            </j:forEach>
         </j:if>
-      </j:forEach>
-    </j:if>
-    
-    <!-- Run standard DB-specific SQL scripts -->
-    <util:file name="${org.apache.jetspeed.plugin.root}/plugin-resources/${org.apache.jetspeed.production.database.default.name}" var="sqlSrcDir"/>
-    <j:if test="${sqlSrcDir.exists()}">
-      <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlFile">
-        <j:if test="${sqlFile.name.endsWith('.sql')}">
-          <j:set var="database.arg.script" value="${sqlFile.absolutePath}" />
-          <attainGoal name="jetspeed2:db.execute" />
+
+        <!-- Run standard DB-specific SQL scripts -->
+        <util:file
+            name="${org.apache.jetspeed.plugin.root}/plugin-resources/${org.apache.jetspeed.production.database.default.name}"
+            var="sqlSrcDir" />
+        <j:if test="${sqlSrcDir.exists()}">
+            <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlFile">
+                <j:if test="${sqlFile.name.endsWith('.sql')}">
+                    <j:set var="database.arg.script" value="${sqlFile.absolutePath}" />
+                    <attainGoal name="jetspeed2:db.execute" />
+                </j:if>
+            </j:forEach>
         </j:if>
-      </j:forEach>
-    </j:if>
-    
-    <!-- Run standard non-DB-specific SQL scripts -->
-    <util:file name="${org.apache.jetspeed.plugin.root}/plugin-resources" var="sqlSrcDir"/>
-    <j:if test="${sqlSrcDir.exists()}">
-      <j:set var="db.src.dir" value="${org.apache.jetspeed.plugin.root}/plugin-resources/${org.apache.jetspeed.production.database.default.name}"/>
-      <util:file name="${db.src.dir}/populate/populate-userinfo-for-default-psml.sql" var="dbSpecificPopulateScript"/>
-      <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlFile">
-        <j:if test="${sqlFile.name.endsWith('.sql')}">
-          <j:choose>
-            <j:when test="${sqlFile.name.equals('populate-userinfo-for-default-psml.sql') and dbSpecificPopulateScript.exists()}">
-              <j:set var="database.arg.script" value="${dbSpecificPopulateScript.absolutePath}"/>
-            </j:when>
-            <j:otherwise>
-              <j:set var="database.arg.script" value="${sqlFile.absolutePath}" />
-            </j:otherwise>
-          </j:choose>
-          <attainGoal name="jetspeed2:db.execute" />
+
+        <!-- Run standard non-DB-specific SQL scripts -->
+        <util:file name="${org.apache.jetspeed.plugin.root}/plugin-resources" var="sqlSrcDir" />
+        <j:if test="${sqlSrcDir.exists()}">
+            <j:set var="db.src.dir"
+                value="${org.apache.jetspeed.plugin.root}/plugin-resources/${org.apache.jetspeed.production.database.default.name}" />
+            <util:file name="${db.src.dir}/populate/populate-userinfo-for-default-psml.sql"
+                var="dbSpecificPopulateScript" />
+            <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlFile">
+                <j:if test="${sqlFile.name.endsWith('.sql')}">
+                    <j:choose>
+                        <j:when
+                            test="${sqlFile.name.equals('populate-userinfo-for-default-psml.sql') and dbSpecificPopulateScript.exists()}">
+                            <j:set var="database.arg.script" value="${dbSpecificPopulateScript.absolutePath}" />
+                        </j:when>
+                        <j:otherwise>
+                            <j:set var="database.arg.script" value="${sqlFile.absolutePath}" />
+                        </j:otherwise>
+                    </j:choose>
+                    <attainGoal name="jetspeed2:db.execute" />
+                </j:if>
+            </j:forEach>
         </j:if>
-      </j:forEach>
-    </j:if>
-     
-    <!-- Run custom SQL scripts if they exist -->
-    <util:file name="src/sql" var="sqlSrcDir"/>
-    <j:if test="${sqlSrcDir.exists()}">
-    <echo>*************************************</echo>
-    <echo>* Executing user-defined SQL Scripts *</echo>
-    <echo>*************************************</echo>
-    <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlFile">
-      <j:if test="${sqlFile.name.endsWith('.sql')}">
-        <j:set var="database.arg.script" value="${sqlFile.absolutePath}" />
-        <attainGoal name="jetspeed2:db.execute" />
-      </j:if>
-    </j:forEach>
-  </j:if>
-  </goal>
-  
-
-  
-  <goal name="jetspeed2:build.portal"> 
-  	
-  	 <copy todir="${basedir}/etc/project-dependencies" overwrite="true" failonerror="true">
-         <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-dependencies" />
-     </copy>
-     <copy todir="${basedir}/etc/project-resources" overwrite="true" failonerror="true">
-         <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-resources" />
-     </copy>
-     <copy todir="${basedir}/etc/project-reports" overwrite="true" failonerror="true">
-         <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-reports" />
-     </copy>
-     <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.ent" tofile="${basedir}/locator.ent" overwrite="true" failonerror="true"/> 
-     <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.path" tofile="${basedir}/locator.path" overwrite="true" failonerror="true"/>   	
-  	<j:set var="portal_project_desc_path" value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" /> 	
-  	 	
-  	<maven:pom projectDescriptor="${portal_project_desc_path}" var="portal_project" />
-
-  	<attainGoal name="war:webapp" />
-  	<j:set var="webapp.build.webinf" value="${maven.war.webapp.dir}/WEB-INF"/>
-  	<j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib"/>
-  	
-  	 <j:forEach var="lib" items="${portal_project.artifacts}">
-      <j:set var="dep" value="${lib.dependency}"/>
-      <j:if test="${dep.getProperty('war.bundle')=='true'}">                                                                                
-         <j:if test="${dep.type =='jar'}">
-           <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>
-         </j:if>
-                                                                                
-         <j:if test="${dep.type =='tld'}">
-           <ant:copy todir="${webapp.build.tlds}" file="${lib.path}"/>
-         </j:if>
-                                                                                
-      </j:if>
-      <!-- TO BE REMOVED -->
-      <j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
-         <ant:echo>
-            DEPRECATION WARNING:
-            Use : war.bundle instead of war.bundle.jar
-          </ant:echo>
-        <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>
-      </j:if>
-       <!-- END OF TO BE REMOVED -->
-    </j:forEach>
-   <echo>Copying Jetspeed 2 portal files...</echo>
-  	<copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-${jetspeed.version}.jar" todir="${webapp.build.lib}" failonerror="true" overwrite="true"/>
-  	<copy todir="${maven.war.webapp.dir}" failonerror="true" overwrite="false">
-         <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp" />            	       	       
-     </copy>	  
-     
-     <echo>Copying custom portal files...</echo>
-     <copy todir="${maven.war.webapp.dir}" failonerror="true" overwrite="true">
-         <fileset dir="${basedir}/src/webapp"/>
-     </copy>     
-     
-       <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp/WEB-INF/conf/jetspeed.properties" tofile="${maven.war.webapp.dir}/WEB-INF/conf/jetspeed.properties" overwrite="true">
-        <filterset begintoken="@" endtoken="@">
-          <filter token="AUTODEPLOYMENT_SERVER" value="${org.apache.jetspeed.services.autodeployment.server}"/>
-          <filter token="AUTODEPLOYMENT_PORT" value="${org.apache.jetspeed.services.autodeployment.port}"/>
-          <filter token="AUTODEPLOYMENT_USER" value="${org.apache.jetspeed.services.autodeployment.user}"/>
-          <filter token="AUTODEPLOYMENT_PASSWORD" value="${org.apache.jetspeed.services.autodeployment.password}"/>
-        </filterset>
-        <!-- Below filter is special because this concerns a numeric property for which a non-numeric token results
-             in a test failure (TestSpringEngine)
-             This property therefore MUST remain defined EXACTLY as specified for this filter to be able to work
-        -->
-        <filterset begintoken="autodeployment.catalina.version.major" endtoken="5">
-          <filter token="=" value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
-        </filterset>
-        <filterset begintoken="autodeployment.port" endtoken="8080">
-          <filter token="=" value="autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
-        </filterset>
-      </copy>
-      
-         
-    <attainGoal name="war:war" />
-  </goal>
-  
-  <goal name="jetspeed2:build.portal.debug" >
-  	
-     <copy todir="${basedir}/etc/project-dependencies" overwrite="true" failonerror="true">
-         <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-dependencies" />            	       	       
-     </copy>
-     <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.ent" tofile="${basedir}/locator.ent" overwrite="true" failonerror="true"/> 
-	 <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.path" tofile="${basedir}/locator.path" overwrite="true" failonerror="true"/> 
-  	
-	
-    <echo>Copying Jetspeed 2 portal files...</echo>
-  	<copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-${jetspeed.version}.jar" todir="${webapp.build.lib}" failonerror="true" overwrite="true"/>
-  	<copy todir="${basedir}/target/debug" failonerror="true" overwrite="false">
-         <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp" />            	       	       
-     </copy>	  
-     
-     <echo>Copying custom portal files...</echo>
-     <copy todir="${basedir}/target/debug" failonerror="true" overwrite="true">
-         <fileset dir="${basedir}/src/webapp"/>
-     </copy>
-     
-     <copy file="${basedir}/src/webapp/WEB-INF/conf/jetspeed.properties" tofile="${basedir}/target/debug/WEB-INF/conf/jetspeed.properties" overwrite="true">
-      <filterset begintoken="@" endtoken="@">
-        <filter token="AUTODEPLOYMENT_USER" value="${org.apache.jetspeed.services.autodeployment.user}"/>
-        <filter token="AUTODEPLOYMENT_PASSWORD" value="${org.apache.jetspeed.services.autodeployment.password}"/>
-      </filterset>
-      <!-- Below filter is special because this concerns a numeric property for which a non-numeric token results
-           in a test failure (TestSpringEngine)
-           This property therefore MUST remain defined EXACTLY as specified for this filter to be able to work
-      -->
-      <filterset begintoken="autodeployment.catalina.version.major" endtoken="5">
-        <filter token="=" value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
-      </filterset>
-    </copy>
-  	
-  </goal>
-  
-  <goal name='jetspeed2:deploy.shared'>
-    <echo>Copying from ${maven.repo.local} to ${org.apache.jetspeed.server.shared}...</echo>
-    
-    <j:set var="portal_project_desc_path" value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" /> 	
-  	 	
-  	<maven:pom projectDescriptor="${portal_project_desc_path}" var="portal_project" />
-    
-    <copy file="${portal_project.getDependencyPath('pluto')}" todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true"/>
-    <copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-commons')}" todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true" />
-    <copy file="${portal_project.getDependencyPath('portlet-api')}" todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true"/>  	  
-    <copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-api')}" todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true"/>    
-    <copy file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-0.1.jar" todir="${org.apache.jetspeed.server.shared}"/>    
-    <copy file="${maven.repo.local}/portals-bridges/jars/portals-bridges-struts-0.1.jar" todir="${org.apache.jetspeed.server.shared}"/>    
-  </goal>
-  
-  <!-- This currently DOES NOT WORK, even after getting SCP to work in ant 1.6.2 -->
-  <goal name='jetspeed2:deploy.shared.scp'>
-    <echo>Copying from ${maven.repo.local} to ${org.apache.jetspeed.server.shared} using SCP...</echo>
-    
-    <j:set var="portal_project_desc_path" value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" /> 	
-  	 	
-  	<maven:pom projectDescriptor="${portal_project_desc_path}" var="portal_project" />
-    <echo>Pluto: ${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}</echo>
-    <scp file="${portal_project.getDependencyPath('pluto')}" todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true" verbose="true"  keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}"/>
-    <ant:scp file="${portal_project.getDependencyPath('jetspeed2:jetspeed-commons')}" todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"  keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}"/>
-    <ant:scp file="${portal_project.getDependencyPath('portlet-api')}" todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"  keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}"/>  	  
-    <ant:scp file="${portal_project.getDependencyPath('jetspeed2:jetspeed-api')}" todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"  keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}"/>    
-    <ant:scp file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-0.1.jar" todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"  keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}"/>    
-    <ant:scp file="${maven.repo.local}/portals-bridges/jars/portals-bridges-struts-0.1.jar" todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"  keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}"/>    
-  </goal>
-  
-  <goal name="jetspeed2:deploy.portal">  	
-  	
-	<attainGoal name='jetspeed2:deploy.shared'/>  	
-	
-	<j:if test="${org.apache.jetspeed.copy.war}">
-	 <copy todir="${org.apache.jetspeed.deploy.war.dir}" failonerror="true" overwrite="true">
-         <fileset dir="${maven.war.build.dir}" >  
-             <include name="${maven.war.final.name}" />
-         </fileset>	             	       	       
-     </copy>	
-    </j:if>   
-    <j:if test="${org.apache.jetspeed.copy.context}">
-	   <attainGoal name='jetspeed2:copy.context'/>
-	</j:if>
-	          
-     <delete dir="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}"/>
-     <j:if test="${org.apache.jetspeed.explode.war}">
-       <unwar src="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}" dest="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}"/>
-     </j:if>
-     
-
-     
-
-  </goal>
-  
-  <!--
-  <goal name="jetspeed2:unregister.core.pa">
-  	  <j:set var="pam.action" value="unregister"/>
- 	 <j:set var="pam.app.name" value="jetspeed"/>
- 	 <j:set var="pam.app.war" value="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}"/>
- 	 <attainGoal name="pam.template.register"/>
-  </goal>
--->
 
-<goal name="jetspeed2:copy.context">    
+        <!-- Run custom SQL scripts if they exist -->
+        <util:file name="src/sql" var="sqlSrcDir" />
+        <j:if test="${sqlSrcDir.exists()}">
+            <echo>**************************************</echo>
+            <echo>* Executing user-defined SQL Scripts *</echo>
+            <echo>**************************************</echo>
+            <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlFile">
+                <j:if test="${sqlFile.name.endsWith('.sql')}">
+                    <j:set var="database.arg.script" value="${sqlFile.absolutePath}" />
+                    <attainGoal name="jetspeed2:db.execute" />
+                </j:if>
+            </j:forEach>
+        </j:if>
+    </goal>
+
+    <goal name="jetspeed2:build.portal">
+
+        <copy todir="${basedir}/etc/project-dependencies" overwrite="true" failonerror="true">
+            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-dependencies" />
+        </copy>
+        <copy todir="${basedir}/etc/project-resources" overwrite="true" failonerror="true">
+            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-resources" />
+        </copy>
+        <copy todir="${basedir}/etc/project-reports" overwrite="true" failonerror="true">
+            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-reports" />
+        </copy>
+        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.ent" tofile="${basedir}/locator.ent"
+            overwrite="true" failonerror="true" />
+        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.path" tofile="${basedir}/locator.path"
+            overwrite="true" failonerror="true" />
+        <j:set var="portal_project_desc_path"
+            value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" />
+
+        <maven:pom projectDescriptor="${portal_project_desc_path}" var="portal_project" />
+
+        <attainGoal name="war:webapp" />
+        <j:set var="webapp.build.webinf" value="${maven.war.webapp.dir}/WEB-INF" />
+        <j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib" />
+
+        <j:forEach var="lib" items="${portal_project.artifacts}">
+            <j:set var="dep" value="${lib.dependency}" />
+            <j:if test="${dep.getProperty('war.bundle')=='true'}">
+                <j:if test="${dep.type =='jar'}">
+                    <ant:copy todir="${webapp.build.lib}" file="${lib.path}" />
+                </j:if>
+
+                <j:if test="${dep.type =='tld'}">
+                    <ant:copy todir="${webapp.build.tlds}" file="${lib.path}" />
+                </j:if>
+
+            </j:if>
+            <!-- TO BE REMOVED -->
+            <j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
+                <ant:echo>DEPRECATION WARNING: Use : war.bundle instead of war.bundle.jar</ant:echo>
+                <ant:copy todir="${webapp.build.lib}" file="${lib.path}" />
+            </j:if>
+            <!-- END OF TO BE REMOVED -->
+        </j:forEach>
+        <echo>Copying Jetspeed 2 portal files...</echo>
+        <copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-${jetspeed.version}.jar" todir="${webapp.build.lib}"
+            failonerror="true" overwrite="true" />
+        <copy todir="${maven.war.webapp.dir}" failonerror="true" overwrite="false">
+            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp" />
+        </copy>
+
+        <echo>Copying custom portal files...</echo>
+        <copy todir="${maven.war.webapp.dir}" failonerror="true" overwrite="true">
+            <fileset dir="${basedir}/src/webapp" />
+        </copy>
+
+        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp/WEB-INF/conf/jetspeed.properties"
+            tofile="${maven.war.webapp.dir}/WEB-INF/conf/jetspeed.properties" overwrite="true">
+            <filterset begintoken="@" endtoken="@">
+                <filter token="AUTODEPLOYMENT_SERVER" value="${org.apache.jetspeed.services.autodeployment.server}" />
+                <filter token="AUTODEPLOYMENT_PORT" value="${org.apache.jetspeed.services.autodeployment.port}" />
+                <filter token="AUTODEPLOYMENT_USER" value="${org.apache.jetspeed.services.autodeployment.user}" />
+                <filter token="AUTODEPLOYMENT_PASSWORD" value="${org.apache.jetspeed.services.autodeployment.password}" />
+            </filterset>
+            <!-- Below filter is special because this concerns a numeric property for which a non-numeric token results
+                in a test failure (TestSpringEngine)
+                This property therefore MUST remain defined EXACTLY as specified for this filter to be able to work
+            -->
+            <filterset begintoken="autodeployment.catalina.version.major" endtoken="5">
+                <filter token="="
+                    value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}" />
+            </filterset>
+            <filterset begintoken="autodeployment.port" endtoken="8080">
+                <filter token="=" value="autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}" />
+            </filterset>
+        </copy>
+
+
+        <attainGoal name="war:war" />
+    </goal>
+
+    <goal name="jetspeed2:build.portal.debug">
+
+        <copy todir="${basedir}/etc/project-dependencies" overwrite="true" failonerror="true">
+            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-dependencies" />
+        </copy>
+        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.ent" tofile="${basedir}/locator.ent"
+            overwrite="true" failonerror="true" />
+        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.path" tofile="${basedir}/locator.path"
+            overwrite="true" failonerror="true" />
+
+
+        <echo>Copying Jetspeed 2 portal files...</echo>
+        <copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-${jetspeed.version}.jar" todir="${webapp.build.lib}"
+            failonerror="true" overwrite="true" />
+        <copy todir="${basedir}/target/debug" failonerror="true" overwrite="false">
+            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp" />
+        </copy>
+
+        <echo>Copying custom portal files...</echo>
+        <copy todir="${basedir}/target/debug" failonerror="true" overwrite="true">
+            <fileset dir="${basedir}/src/webapp" />
+        </copy>
+
+        <copy file="${basedir}/src/webapp/WEB-INF/conf/jetspeed.properties"
+            tofile="${basedir}/target/debug/WEB-INF/conf/jetspeed.properties" overwrite="true">
+            <filterset begintoken="@" endtoken="@">
+                <filter token="AUTODEPLOYMENT_USER" value="${org.apache.jetspeed.services.autodeployment.user}" />
+                <filter token="AUTODEPLOYMENT_PASSWORD" value="${org.apache.jetspeed.services.autodeployment.password}" />
+            </filterset>
+            <!-- Below filter is special because this concerns a numeric property for which a non-numeric token results
+                in a test failure (TestSpringEngine)
+                This property therefore MUST remain defined EXACTLY as specified for this filter to be able to work
+            -->
+            <filterset begintoken="autodeployment.catalina.version.major" endtoken="5">
+                <filter token="="
+                    value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}" />
+            </filterset>
+        </copy>
+
+    </goal>
+
+    <goal name='jetspeed2:deploy.shared'>
+        <echo>Copying from ${maven.repo.local} to ${org.apache.jetspeed.server.shared}...</echo>
+
+        <j:set var="portal_project_desc_path"
+            value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" />
+
+        <maven:pom projectDescriptor="${portal_project_desc_path}" var="portal_project" />
+
+        <copy file="${portal_project.getDependencyPath('pluto')}" todir="${org.apache.jetspeed.server.shared}"
+            failonerror="true" overwrite="true" />
+        <copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-commons')}"
+            todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true" />
+        <copy file="${portal_project.getDependencyPath('portlet-api')}" todir="${org.apache.jetspeed.server.shared}"
+            failonerror="true" overwrite="true" />
+        <copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-api')}"
+            todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true" />
+        <copy file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-0.1.jar"
+            todir="${org.apache.jetspeed.server.shared}" />
+        <copy file="${maven.repo.local}/portals-bridges/jars/portals-bridges-struts-0.1.jar"
+            todir="${org.apache.jetspeed.server.shared}" />
+    </goal>
+
+    <!-- This currently DOES NOT WORK, even after getting SCP to work in ant 1.6.2 -->
+    <goal name='jetspeed2:deploy.shared.scp'>
+        <echo>Copying from ${maven.repo.local} to ${org.apache.jetspeed.server.shared} using SCP...</echo>
+
+        <j:set var="portal_project_desc_path"
+            value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" />
+
+        <maven:pom projectDescriptor="${portal_project_desc_path}" var="portal_project" />
+        <echo>Pluto: ${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}</echo>
+        <scp file="${portal_project.getDependencyPath('pluto')}"
+            todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"
+            verbose="true" keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}" />
+        <ant:scp file="${portal_project.getDependencyPath('jetspeed2:jetspeed-commons')}"
+            todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"
+            keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}" />
+        <ant:scp file="${portal_project.getDependencyPath('portlet-api')}"
+            todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"
+            keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}" />
+        <ant:scp file="${portal_project.getDependencyPath('jetspeed2:jetspeed-api')}"
+            todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"
+            keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}" />
+        <ant:scp file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-0.1.jar"
+            todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"
+            keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}" />
+        <ant:scp file="${maven.repo.local}/portals-bridges/jars/portals-bridges-struts-0.1.jar"
+            todir="${org.apache.jetspeed.scp.user}@${org.apache.jetspeed.server.shared}" failonerror="true"
+            keyfile="${org.apache.jetspeed.key.file}" passphrase="${org.apache.jetspeed.key.passphrase}" />
+    </goal>
+
+    <goal name="jetspeed2:deploy.portal">
+
+        <attainGoal name='jetspeed2:deploy.shared' />
+
+        <j:if test="${org.apache.jetspeed.copy.war}">
+            <copy todir="${org.apache.jetspeed.deploy.war.dir}" failonerror="true" overwrite="true">
+                <fileset dir="${maven.war.build.dir}">
+                    <include name="${maven.war.final.name}" />
+                </fileset>
+            </copy>
+        </j:if>
+        <j:if test="${org.apache.jetspeed.copy.context}">
+            <attainGoal name='jetspeed2:copy.context' />
+        </j:if>
+
+        <delete dir="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}" />
+        <j:if test="${org.apache.jetspeed.explode.war}">
+            <unwar src="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}"
+                dest="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}" />
+        </j:if>
 
-     <j:set var="catalina_version_major" value="${org.apache.jetspeed.catalina.version.major}"/>
-      <echo>Build jetspeed.xml for Tomcat version ${catalina_version_major}</echo>
-      <j:choose>
-        <j:when test="${catalina_version_major == '5.5'}" >
-          <j:set var="context_file_source" value="jetspeed-tomcat-5.5.xml"/>
-        </j:when>
-        <j:otherwise>
-          <j:set var="context_file_source" value="jetspeed-tomcat-5.xml"/>
-        </j:otherwise>
-      </j:choose>
-      <j:set var="context_file_target" value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/jetspeed.xml"/>
-      
-      <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/${context_file_source}" tofile="${context_file_target}" overwrite="true">
-        <filterset begintoken="@" endtoken="@">
-          <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
-          <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
-          <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}"/>
-          <filter token="URL" value="${org.apache.jetspeed.production.database.url}"/>
-        </filterset>
-      </copy>
-</goal>   
 
 
-  <goal name='jetspeed2:deploy.shared.local'>
-    <echo>Copying from ${maven.repo.local} to ./target/shared...</echo>
-    
-    <j:set var="portal_project_desc_path" value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" /> 	
-  	 	
-  	<maven:pom projectDescriptor="${portal_project_desc_path}" var="portal_project" />
-    
-    <copy file="${portal_project.getDependencyPath('pluto')}" todir="./target/shared" failonerror="true" overwrite="true"/>
-    <copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-commons')}" todir="./target/shared" failonerror="true" overwrite="true" />
-    <copy file="${portal_project.getDependencyPath('portlet-api')}" todir="./target/shared" failonerror="true" overwrite="true"/>  	  
-    <copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-api')}" todir="./target/shared" failonerror="true" overwrite="true"/>    
-    <copy file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-0.1.jar" todir="./target/shared"/>    
-    <copy file="${maven.repo.local}/portals-bridges/jars/portals-bridges-struts-0.2.jar" todir="./target/shared"/>    
-  </goal> 
 
+    </goal>
+
+    <!--
+        <goal name="jetspeed2:unregister.core.pa">
+        <j:set var="pam.action" value="unregister"/>
+        <j:set var="pam.app.name" value="jetspeed"/>
+        <j:set var="pam.app.war" value="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}"/>
+        <attainGoal name="pam.template.register"/>
+        </goal>
+    -->
+
+    <goal name="jetspeed2:copy.context">
+
+        <j:set var="catalina_version_major" value="${org.apache.jetspeed.catalina.version.major}" />
+        <echo>Build jetspeed.xml for Tomcat version ${catalina_version_major}</echo>
+        <j:choose>
+            <j:when test="${catalina_version_major == '5.5'}">
+                <j:set var="context_file_source" value="jetspeed-tomcat-5.5.xml" />
+            </j:when>
+            <j:otherwise>
+                <j:set var="context_file_source" value="jetspeed-tomcat-5.xml" />
+            </j:otherwise>
+        </j:choose>
+        <j:set var="context_file_target"
+            value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/jetspeed.xml" />
+
+        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/${context_file_source}"
+            tofile="${context_file_target}" overwrite="true">
+            <filterset begintoken="@" endtoken="@">
+                <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}" />
+                <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}" />
+                <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}" />
+                <filter token="URL" value="${org.apache.jetspeed.production.database.url}" />
+            </filterset>
+        </copy>
+    </goal>
+
+
+    <goal name='jetspeed2:deploy.shared.local'>
+        <echo>Copying from ${maven.repo.local} to ./target/shared...</echo>
+
+        <j:set var="portal_project_desc_path"
+            value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" />
+
+        <maven:pom projectDescriptor="${portal_project_desc_path}" var="portal_project" />
+
+        <copy file="${portal_project.getDependencyPath('pluto')}" todir="./target/shared" failonerror="true"
+            overwrite="true" />
+        <copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-commons')}" todir="./target/shared"
+            failonerror="true" overwrite="true" />
+        <copy file="${portal_project.getDependencyPath('portlet-api')}" todir="./target/shared" failonerror="true"
+            overwrite="true" />
+        <copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-api')}" todir="./target/shared"
+            failonerror="true" overwrite="true" />
+        <copy file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-0.1.jar" todir="./target/shared" />
+        <copy file="${maven.repo.local}/portals-bridges/jars/portals-bridges-struts-0.2.jar" todir="./target/shared" />
+    </goal>
 
-  
 </project>
 

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.properties?rev=209405&r1=209404&r2=209405&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.properties (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.properties Tue Jul  5 20:30:40 2005
@@ -43,8 +43,6 @@
 maven.war.build.dir=${maven.build.dir}
 maven.war.webapp.dir=${maven.war.build.dir}/${pom.artifactId}
 
-
-
 # Specifies whether or not to expand the war when deploy.portal is called.
 # If this is set to false, "org.apache.jetspeed.copy.war" must be set to true.
 # You can override this property either in you project's project.properties



---------------------------------------------------------------------
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