portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject svn commit: r216250 - in /portals/jetspeed-2/trunk/maven-plugin: maven.xml plugin.jelly project.xml
Date Wed, 13 Jul 2005 21:13:38 GMT
Author: weaver
Date: Wed Jul 13 14:13:36 2005
New Revision: 216250

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

Modified:
    portals/jetspeed-2/trunk/maven-plugin/maven.xml
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
    portals/jetspeed-2/trunk/maven-plugin/project.xml

Modified: portals/jetspeed-2/trunk/maven-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/maven.xml?rev=216250&r1=216249&r2=216250&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/maven.xml Wed Jul 13 14:13:36 2005
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
 <!--
     Copyright 2004 The Apache Software Foundation
     
@@ -23,13 +20,7 @@
     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/db-ojb" overwrite="true" failonerror="true">
-            <fileset dir="../etc/db-ojb" />
-        </copy>
-        <copy todir="target/classes/plugin-resources/etc/project-dependencies" 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">
@@ -38,21 +29,26 @@
         <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;" />
+                <filter token="JETSPEED_VERSION" value="${jetspeed.version}" />
                 <filter token="JETSPEED_GROUPID" value="${pom.groupId}" />
-                <filter token="PLUTO_VERSION" value="&pluto-version;" />
-                <filter token="PORTALS_BRIDGES_COMMON_VERSION" value="&portals-bridges-common-version;"
/>
+                <filter token="PLUTO_VERSION" value="${pluto.version}" />
+                <filter token="PORTALS_BRIDGES_COMMON_VERSION" value="${portals.bridges.common.version}"
/>
             </filterset>
         </copy>
+
     </preGoal>
 
+
+
     <goal name="deploy-plugin">
         <attainGoal name="clean" />
         <attainGoal name="copyPortlaWebApp" />
@@ -71,8 +67,8 @@
         <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="target/classes/plugin-resources/webapp/WEB-INF/deploy/jetspeed-layouts.war"
overwrite="true" failonerror="true" />
+        <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" />       
         <copy file="../portal-webapp/project.xml.template" tofile="${basedir}/target/classes/plugin-resources/portal_project.xml"
             overwrite="true" failonerror="true">
             <filterset begintoken="@" endtoken="@">
@@ -83,12 +79,12 @@
             </filterset>
         </copy>
     </goal>
-    
+
     <goal name="deploy-plugin-withoutwebapp">
     	<attainGoal name="clean" />
     	<attainGoal name="core-deploy-plugin" />
     </goal>
-    
+
     <goal name="core-deploy-plugin">
     	<attainGoal name="undeploy-plugin" />
 

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=216250&r1=216249&r2=216250&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Wed Jul 13 14:13:36 2005
@@ -755,13 +755,7 @@
             </fileset>
         </copy>
         
-        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.ent"
-            tofile="${org.apache.jetspeed.genapp.home}/locator.ent" overwrite="true"
-            failonerror="true" />
-        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.path"
-            tofile="${org.apache.jetspeed.genapp.home}/locator.path" overwrite="true"
-            failonerror="true" />
-        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml"
+          <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml"
             tofile="${org.apache.jetspeed.genapp.home}/project.xml" overwrite="true"
             failonerror="true" />
         

Modified: portals/jetspeed-2/trunk/maven-plugin/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/project.xml?rev=216250&r1=216249&r2=216250&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/project.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/project.xml Wed Jul 13 14:13:36 2005
@@ -1,87 +1,63 @@
 <?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.
+
     $Id$
 -->
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <pomVersion>3</pomVersion>
-    <id>maven-jetspeed2-plugin</id>
-    <groupId>jetspeed2</groupId>
-    <currentVersion>2.0-M4-SNAPSHOT</currentVersion>
-    <name>Jetspeed 2 Maven Plugin</name>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>maven-jetspeed2-plugin</id>
+    <currentVersion>${jetspeed.version}</currentVersion>  
+  <name>Jetspeed 2 Maven Plugin</name>
     <description>Plugin for assisting with portlet development</description>
-    <shortDescription>Portlet Development Plugin</shortDescription>
+  <shortDescription>Portlet Development Plugin</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/maven-plugin</connection>
+  <repository>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/maven-plugin</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/maven-plugin
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/maven-plugin/</url>
-    </repository>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/maven-plugin/</url>
+  </repository>
 
-    <dependencies>
-        <dependency>
-            <id>hsqldb</id>
-            <version>1.7.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/plugin-resources</directory>
-                <targetPath>plugin-resources</targetPath>
-            </resource>
-            <resource>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>plugin.jelly</include>
-                    <include>plugin.properties</include>
-                    <include>project.properties</include>
-                    <include>project.xml</include>
-                    <include>locator.ent</include>
-                </includes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-        <report>maven-jdepend-plugin</report>
-        <!--
-            <report>maven-checkstyle-plugin</report>
-        -->
-        <report>maven-pmd-plugin</report>
-        <report>maven-changelog-plugin</report>
-        <report>maven-file-activity-plugin</report>
-        <report>maven-developer-activity-plugin</report>
-        <report>maven-license-plugin</report>
-        <report>maven-javadoc-plugin</report>
-        <report>maven-jxr-plugin</report>
-        <report>maven-junit-report-plugin</report>
-        <!--
-            <report>maven-linkcheck-plugin</report>
-        -->
-        <report>maven-tasklist-plugin</report>
-    </reports>
+  <dependencies>      
+    <dependency>
+      <id>hsqldb</id>
+      <version>1.7.1</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources> 
+            <resource> 
+                <directory>${basedir}/src/plugin-resources</directory> 
+                <targetPath>plugin-resources</targetPath> 
+            </resource> 
+            <resource> 
+                <directory>${basedir}</directory> 
+                <includes> 
+                    <include>plugin.jelly</include> 
+                    <include>plugin.properties</include> 
+                    <include>project.properties</include> 
+                    <include>project.xml</include>         
+                </includes> 
+            </resource> 
+      </resources> 
+  </build>
 </project>
 



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