portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Marky Goldstein <re...@rosa.com>
Subject Apache Jetspeed 2 Documentation Project - Documentation Process
Date Thu, 14 Jul 2005 06:16:08 GMT
Hi everybody,

We have added a section to describe the
general documentation process
within the 
Apache Jetspeed 2 Documentation Project
to the J2 Wiki main page:
http://wiki.apache.org/portals/Jetspeed2

Please contribute your knowledge, proceedures or ideas on how to
structure the documentation process.

Best regards,
Marky Goldstein

http://www.rosa.com/


dlestrat@apache.org wrote:

>Author: dlestrat
>Date: Wed Jul 13 18:24:21 2005
>New Revision: 218812
>
>URL: http://svn.apache.org/viewcvs?rev=218812&view=rev
>Log:
>Working on fixing broken build after
>
>http://issues.apache.org/jira/browse/JS2-304?page=comments#action_12315720 
>
>Added:
>    portals/jetspeed-2/trunk/portal-webapp/portal-project.xml
>Removed:
>    portals/jetspeed-2/trunk/portal-webapp/project.xml.template
>Modified:
>    portals/jetspeed-2/trunk/.classpath
>    portals/jetspeed-2/trunk/build.properties.sample
>    portals/jetspeed-2/trunk/build.properties.sample.oracle9i
>    portals/jetspeed-2/trunk/maven-plugin/maven.xml
>    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
>    portals/jetspeed-2/trunk/maven-plugin/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=218812&r1=218811&r2=218812&view=diff
>==============================================================================
>--- portals/jetspeed-2/trunk/.classpath (original)
>+++ portals/jetspeed-2/trunk/.classpath Wed Jul 13 18:24:21 2005
>@@ -17,8 +17,6 @@
> 	<classpathentry excluding="**/.svn/*|log4j.properties" kind="src" path="components/locator/src/test"/>
> 	<classpathentry excluding="**/.svn/*" kind="src" path="components/page-manager/src/java"/>
> 	<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"/>
>
>Modified: portals/jetspeed-2/trunk/build.properties.sample
>URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/build.properties.sample?rev=218812&r1=218811&r2=218812&view=diff
>==============================================================================
>--- portals/jetspeed-2/trunk/build.properties.sample (original)
>+++ portals/jetspeed-2/trunk/build.properties.sample Wed Jul 13 18:24:21 2005
>@@ -11,6 +11,7 @@
> 
> org.apache.jetspeed.portal.name=jetspeed
> 
>+# j2:portal.genapp properties
> org.apache.jetspeed.genapp.home= /tools/workspace/testportal
> org.apache.jetspeed.genapp.groupId=testportal
> org.apache.jetspeed.genapp.name=My Test Portal
>
>Modified: portals/jetspeed-2/trunk/build.properties.sample.oracle9i
>URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/build.properties.sample.oracle9i?rev=218812&r1=218811&r2=218812&view=diff
>==============================================================================
>--- portals/jetspeed-2/trunk/build.properties.sample.oracle9i (original)
>+++ portals/jetspeed-2/trunk/build.properties.sample.oracle9i Wed Jul 13 18:24:21 2005
>@@ -11,6 +11,7 @@
> 
> org.apache.jetspeed.portal.name=jetspeed
> 
>+# j2:portal.genapp properties
> org.apache.jetspeed.genapp.home= /tools/workspace/testportal
> org.apache.jetspeed.genapp.groupId=testportal
> org.apache.jetspeed.genapp.name=My Test Portal
>
>Modified: portals/jetspeed-2/trunk/maven-plugin/maven.xml
>URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/maven.xml?rev=218812&r1=218811&r2=218812&view=diff
>==============================================================================
>--- portals/jetspeed-2/trunk/maven-plugin/maven.xml (original)
>+++ portals/jetspeed-2/trunk/maven-plugin/maven.xml Wed Jul 13 18:24:21 2005
>@@ -20,27 +20,7 @@
>     xmlns:ant="jelly:ant" xmlns:util="jelly:util">
> 
>     <preGoal name="java:jar-resources">
>-        <!--
>-         <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>
>-        -->
>-        <!--
>-        <attainGoal name="copyDb" />
>-        -->
>-        <copy todir="target/classes/plugin-resources/etc/db-ojb" overwrite="true"
failonerror="true">
>-            <fileset dir="../etc/db-ojb" />
>-        </copy>
>-        
>-        <attainGoal name="copyPortlaWebApp" />
>-        <copy file="../portal-webapp/project.xml" tofile="${basedir}/target/classes/plugin-resources/portal_project.xml"
>-            overwrite="true" failonerror="true" />
>+    	<attainGoal name="copyPortlaWebApp" />
>         <copy file="plugin.properties" tofile="${basedir}/target/classes/plugin.properties"
overwrite="true"
>             failonerror="true">
>             <filterset begintoken="@" endtoken="@">
>@@ -53,8 +33,6 @@
> 
>     </preGoal>
> 
>-
>-
>     <goal name="deploy-plugin">
>         <attainGoal name="clean" />
>         <attainGoal name="copyPortlaWebApp" />
>@@ -75,7 +53,15 @@
>         </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" />       
>-        <copy file="../portal-webapp/project.xml.template" tofile="${basedir}/target/classes/plugin-resources/portal_project.xml"
>+        <copy file="../full-portal.xml"
>+            tofile="target/classes/plugin-resources/full-portal.xml" overwrite="true"
>+            failonerror="true" />
>+        <copy file="../core-build.xml"
>+            tofile="target/classes/plugin-resources/core-build.xml" overwrite="true"
>+            failonerror="true" />
>+        <copy file="../portal-webapp/portal-project.xml" tofile="${basedir}/target/classes/plugin-resources/portal-project.xml"
>+            overwrite="true" failonerror="true" />
>+        <copy file="../portal-webapp/portal-project-info.xml" tofile="${basedir}/target/classes/plugin-resources/project-info.xml"
>             overwrite="true" failonerror="true">
>             <filterset begintoken="@" endtoken="@">
>                 <filter token="GENAPP_GROUPID" value="${org.apache.jetspeed.genapp.groupId}"
/>
>@@ -84,6 +70,18 @@
>                 <filter token="GENAPP_CURRENT_VERSION" value="${org.apache.jetspeed.genapp.currentVersion}"
/>
>             </filterset>
>         </copy>
>+        <echoproperties destfile="${basedir}/target/classes/plugin-resources/project.properties"
failonerror="true">
>+    		<propertyset>
>+			    <!-- <propertyref refid="jetspeed.version"/>
>+			    <propertyref refid="pluto.version"/>
>+			    <propertyref refid="portlet.api.version"/>
>+			    <propertyref refid="servlet.api.version"/>
>+			    <propertyref refid="myfaces.version"/>
>+			    <propertyref refid="spring.version"/>-->
>+			    <propertyref prefix="portals.bridges."/>
>+			    <!-- <propertyref refid="commons.logging.version"/>-->
>+		    </propertyset>
>+		</echoproperties>
>     </goal>
> 
>     <goal name="deploy-plugin-withoutwebapp">
>
>Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
>URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=218812&r1=218811&r2=218812&view=diff
>==============================================================================
>--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
>+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Wed Jul 13 18:24:21 2005
>@@ -747,15 +747,18 @@
>     	<copy todir="${org.apache.jetspeed.genapp.home}/src/webapp" overwrite="true"
failonerror="true">
>             <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp"
/>
>         </copy>
>-        <mkdir dir="${org.apache.jetspeed.genapp.home}/etc"/>
>-        <copy todir="${org.apache.jetspeed.genapp.home}/etc" overwrite="true" failonerror="true">
>-            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc"
>
>-            	<exclude name="db-ojb/**"/>
>-            	<exclude name="project-reports/**"/>
>-            </fileset>
>-        </copy>
>         
>-          <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml"
>+        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/full-portal.xml"
>+            tofile="${org.apache.jetspeed.genapp.home}/full-portal.xml" overwrite="true"
>+            failonerror="true" />
>+        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/project-info.xml"
>+            tofile="${org.apache.jetspeed.genapp.home}/project-info.xml" overwrite="true"
>+            failonerror="true" />
>+        <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/core-build.xml"
>+            tofile="${org.apache.jetspeed.genapp.home}/core-build.xml" overwrite="true"
>+            failonerror="true" />
>+           
>+        <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=218812&r1=218811&r2=218812&view=diff
>==============================================================================
>--- portals/jetspeed-2/trunk/maven-plugin/project.xml (original)
>+++ portals/jetspeed-2/trunk/maven-plugin/project.xml Wed Jul 13 18:24:21 2005
>@@ -1,63 +1,62 @@
> <?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>
>-    <currentVersion>${jetspeed.version}</currentVersion>  
>-  <name>Jetspeed 2 Maven Plugin</name>
>+    <extend>${basedir}/../project-info.xml</extend>
>+    <pomVersion>3</pomVersion>
>+    <id>maven-jetspeed2-plugin</id>
>+    <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>
>-    <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>
>+    <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>
> 
>
>Added: portals/jetspeed-2/trunk/portal-webapp/portal-project.xml
>URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/portal-project.xml?rev=218812&view=auto
>==============================================================================
>--- portals/jetspeed-2/trunk/portal-webapp/portal-project.xml (added)
>+++ portals/jetspeed-2/trunk/portal-webapp/portal-project.xml Wed Jul 13 18:24:21 2005
>@@ -0,0 +1,45 @@
>+<?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
>+    
>+    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.xml 209405 2005-07-06 03:30:40Z dlestrat $
>+-->
>+<!--
>+Project file used for j2:genapp.portal and embedded in the Jetspeed plugin.
>+-->
>+
>+<project>
>+    <extend>full-portal.xml</extend>
>+    
>+    <dependencies>
>+        <dependency>
>+            <groupId>hsqldb</groupId>
>+            <artifactId>hsqldb</artifactId>
>+            <version>1.7.1</version>
>+            <type>jar</type>
>+            <properties>
>+                <war.bundle>false</war.bundle>
>+            </properties>
>+        </dependency>
>+        <dependency>
>+            <groupId>maven-plugins</groupId>
>+            <artifactId>maven-torque-plugin</artifactId>
>+            <version>3.2</version>
>+            <type>plugin</type>
>+            <properties/>
>+        </dependency>
>+    </dependencies>
>+</project>
>+
>
>Modified: portals/jetspeed-2/trunk/project.properties
>URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=218812&r1=218811&r2=218812&view=diff
>==============================================================================
>--- portals/jetspeed-2/trunk/project.properties (original)
>+++ portals/jetspeed-2/trunk/project.properties Wed Jul 13 18:24:21 2005
>@@ -15,11 +15,8 @@
> pluto.version=1.0-svn-201864
> portlet.api.version=1.0
> servlet.api.version=2.3
>-
> myfaces.version=1.0.9
>-
> spring.version=1.1.5
>-
> portals.bridges.common.version=0.4-SNAPSHOT
> portals.bridges.frameworks.version=0.4-SNAPSHOT
> portals.bridges.jsf.version=0.4-SNAPSHOT
>@@ -27,8 +24,8 @@
> portals.bridges.php.version=0.4-SNAPSHOT
> portals.bridges.struts.version=0.4-SNAPSHOT
> portals.bridges.velocity.version=0.4-SNAPSHOT
>-
> commons.logging.version=1.0.3
>+
> # Whether or not to include log4j in war files
> commons.logging.include=true
> 
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
>For additional commands, e-mail: jetspeed-dev-help@portals.apache.org
>
>  
>



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