You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2005/11/22 23:28:54 UTC
svn commit: r348275 - in /portals/jetspeed-2/trunk: .classpath maven.xml
project.properties xdocs/j2-maven-plugin.xml
Author: taylor
Date: Tue Nov 22 14:28:51 2005
New Revision: 348275
URL: http://svn.apache.org/viewcvs?rev=348275&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-413
Simplify Build, step one
Combine security, pam, palm --> j2-admin single portlet app
Modified:
portals/jetspeed-2/trunk/.classpath
portals/jetspeed-2/trunk/maven.xml
portals/jetspeed-2/trunk/project.properties
portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml
Modified: portals/jetspeed-2/trunk/.classpath
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/.classpath?rev=348275&r1=348274&r2=348275&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/.classpath (original)
+++ portals/jetspeed-2/trunk/.classpath Tue Nov 22 14:28:51 2005
@@ -55,10 +55,8 @@
<classpathentry excluding="**/.svn/*" kind="src" path="applications/gems/src/java"/>
<classpathentry excluding="**/.svn/*|log4j.properties" kind="src" path="applications/jpetstore/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src" path="applications/jsf-demo/src/java"/>
- <classpathentry excluding="**/.svn/*" kind="src" path="applications/palm/src/java"/>
- <classpathentry excluding="**/.svn/*" kind="src" path="applications/pam/src/java"/>
+ <classpathentry excluding="**/.svn/*" kind="src" path="applications/j2-admin/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src" path="applications/rss/src/java"/>
- <classpathentry excluding="**/.svn/*" kind="src" path="applications/security/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src" path="applications/struts-demo/src/java"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="MAVEN_REPO/jdom/jars/jdom-1.0.jar"/>
Modified: portals/jetspeed-2/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven.xml?rev=348275&r1=348274&r2=348275&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven.xml Tue Nov 22 14:28:51 2005
@@ -282,4 +282,11 @@
value="./etc/import/import.properties"/>
</java>
</goal>
+
+ <goal name='pages'>
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/pages/">
+ <fileset dir="./src/webapp/WEB-INF/pages/"/>
+ </copy>
+
+ </goal>
</project>
Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=348275&r1=348274&r2=348275&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Tue Nov 22 14:28:51 2005
@@ -95,7 +95,7 @@
maven.multiproject.ignoreFailures=false
jar.includes=applications/gems/project.xml,portlet-api/project.xml,commons/project.xml,cps/project.xml,content-server/project.xml,jetspeed-api/project.xml,components/**/project.xml,taglibs/treecontrol/project.xml
-jar.excludes=/project.xml,maven-plugin/**,layout-portlets/**,applications/project.xml,applications/demo/**,applications/jsf-demo/**,applications/localeselector/**,applications/palm/**,applications/pam/**,applications/perl/**,applications/php/**,applications/rss/**,applications/security/**,applications/struts-demo/**,,applications/jpetstore/**site/project.xml,design-docs/project.xml
+jar.excludes=/project.xml,maven-plugin/**,layout-portlets/**,applications/project.xml,applications/demo/**,applications/jsf-demo/**,applications/localeselector/**,applications/perl/**,applications/php/**,applications/rss/**,applications/j2-admin/**,applications/struts-demo/**,,applications/jpetstore/**site/project.xml,design-docs/project.xml
maven.multiproject.site.goals=site pdf dashboard:report-single
# For site only, comment line above, uncomment line below.
Modified: portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml?rev=348275&r1=348274&r2=348275&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml Tue Nov 22 14:28:51 2005
@@ -354,12 +354,8 @@
<td>Deploys Jetspeed local layout portlet application.</td>
</tr>
<tr>
- <td><code>j2:pam.palmdeploy</code></td>
- <td>Deploys Jetspeed portlet application lifecycle management portlet application.</td>
- </tr>
- <tr>
- <td><code>j2:pam.pamdeploy</code></td>
- <td>Deploys Jetspeed portlet application management portlet application.</td>
+ <td><code>j2:pam.admindeploy</code></td>
+ <td>Deploys Jetspeed Administration portlet application.</td>
</tr>
<tr>
<td><code>j2:pam.tsdeploy</code></td>
@@ -382,10 +378,6 @@
<td>Deploys the JSF demo portlet application which uses MyFaces native JSF portlet bridge.</td>
</tr>
<tr>
- <td><code>j2:pam.securitydeploy</code></td>
- <td>Deploys the Jetspeed security administration portlet application.</td>
- </tr>
- <tr>
<td><code>j2:pam.phpdeploy</code></td>
<td>Deploys the Jetspeed PHP bridge demo portlet application.</td>
</tr>
@@ -400,8 +392,8 @@
<tr>
<td><code>j2:nodbMinDeploy</code></td>
<td>
- Deploys the portal using the <code>j2:portal.deploy</code> goal and only the layout and security portlets
- using <code>j2:pam.layoutdeploy</code> and <code>j2:pam.securitydeploy</code>.
+ Deploys the portal using the <code>j2:portal.deploy</code> goal and only the layout and admin portlets
+ using <code>j2:pam.layoutdeploy</code> and <code>j2:pam.admindeploy</code>.
</td>
</tr>
<tr>
@@ -412,23 +404,9 @@
</td>
</tr>
<tr>
- <td><code>j2:nodbBasicDeploy</code></td>
- <td>
- The same functionality as <code>j2:nodbMinDeploy</code> and additionaly deploys the PAM and PALM portlets
- using <code>j2:pam.pamdeploy</code> and <code>j2:pam.palmdeploy</code>.
- </td>
- </tr>
- <tr>
- <td><code>j2:basicDeploy</code></td>
- <td>
- The same functionality as <code>j2:nodbBasicDeploy</code> and additionaly seeds the portal database using
- the <code>j2:db.entities</code> goal.
- </td>
- </tr>
- <tr>
<td><code>j2:nodbfullDeploy</code></td>
<td>
- The same functionality as <code>j2:nodbBasicDeploy</code> but additional deploys all other demo portlet
+ The same functionality as <code>j2:nodbMinDeploy</code> but additional deploys all other demo portlet
applications (see full list above).
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org