weaver 2004/01/09 07:14:21
Modified: portal/src/java/org/apache/jetspeed/tools/pamanager
PortletApplicationManager.java
. GETTING-STARTED.html
portal maven.xml
Log:
- fixed issue with DeploymentManager requiring CTRL-C exit It now exits as expected
when finished.
- Added new goal to /portal, fullDeploy. It performs:
- deploy
- pam.register
- pam.deploy
- updated GETTING-STARTED.html to reflect these changes.
Revision Changes Path
1.4 +3 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
Index: PortletApplicationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortletApplicationManager.java 31 Dec 2003 09:46:36 -0000 1.3
+++ PortletApplicationManager.java 9 Jan 2004 15:14:20 -0000 1.4
@@ -293,7 +293,8 @@
System.out.println("Failed shutting down the engine. Error: " +
e1.getMessage());
}
System.out.println("Done");
- return;
+ // return;
+ System.exit(0);
}
public static void helpScreen()
1.3 +2 -5 jakarta-jetspeed-2/GETTING-STARTED.html
Index: GETTING-STARTED.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/GETTING-STARTED.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GETTING-STARTED.html 8 Jan 2004 19:41:27 -0000 1.2
+++ GETTING-STARTED.html 9 Jan 2004 15:14:20 -0000 1.3
@@ -186,13 +186,10 @@
<ol>
<li>cd ${jetspeed-2-home}/portal</li>
<li>maven pam.register </li>
- <li>The console will stay open with [done] message, at this point you can ctrl-c
- to close the deployment tool.</li>
<li>maven pam.deploy </li>
- <li>The console will stay open with [done] message, at this point you can ctrl-c
- to close the deployment tool.</li>
</ol>
-<p> </p>
+<p><strong>NOTE:</strong> Steps 5 and 6 have been combined into the
${jetspeed-2-home}/portal
+ <code>"<b>maven fullDeploy</b>"</code> goal.</p>
<h2>7. Start Tomcat</h2>
<p>Run Tomcat, go to http://localhost:8080/jetspeed.</p>
<h2>(Optional) How to undeploy the demo application</h2>
1.26 +9 -0 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- maven.xml 8 Jan 2004 21:21:30 -0000 1.25
+++ maven.xml 9 Jan 2004 15:14:20 -0000 1.26
@@ -224,6 +224,15 @@
</fileset>
</copy>
</goal>
+
+ <!-- ================================================================ -->
+ <!-- Does all three deployment steps at once
-->
+ <!-- ================================================================ -->
+ <goal name="fullDeploy">
+ <attainGoal name="deploy" />
+ <attainGoal name="pam.register" />
+ <attainGoal name="pam.deploy" />
+ </goal>
<preGoal name="hotdeploy">
<attainGoal name= "java:compile"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
