taylor 2004/08/03 21:01:00
Modified: portal/src/java/org/apache/jetspeed/tools/pamanager
ApplicationServerPAM.java FileSystemPAM.java
portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer
ApplicationServerManager.java JBossManager.java
TomcatManager.java
Log:
J2 is now running on JBoss 3.2.5
Hope to get the build completed soon so that deployment to JBoss is a part of the
build
If you can't wait, here are the steps to deploy to JBoss into the default server as
of today:
Steps to Build Jetspeed on JBoss
1. copy built and expanded /jetspeed directory into
jboss/server/default/deploy/jetspeed.war (directory)
2. copy shared/lib into jboss/server/default/lib
3. copy jetspeed-(mysql)-ds.xml jboss/server/default/deploy/
4. replace JBoss's hsqldb.jar with Jetspeed's, or drop in MySQL driver into
jboss/server/default/lib
5. replace in jetspeed-spring.xml the TomcatApplicationManager with
JBossApplicationManager
org.apache.jetspeed.tools.pamanager.servletcontainer.JBossManager
remove all 4 parameters
6. replace dom4j.jar with dom4j 1.5-rc1.jar
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.8 +2 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/ApplicationServerPAM.java
Index: ApplicationServerPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/ApplicationServerPAM.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApplicationServerPAM.java 1 Aug 2004 15:49:17 -0000 1.7
+++ ApplicationServerPAM.java 4 Aug 2004 04:00:59 -0000 1.8
@@ -46,7 +46,6 @@
protected static final Log log = LogFactory.getLog("deployment");
private boolean started;
- protected ApplicationServerManager appServerManager;
/**
*
@@ -58,9 +57,8 @@
*/
public ApplicationServerPAM( String webAppsDir, PortletRegistryComponent
registry, PortletEntityAccessComponent entityAccess, PortletWindowAccessor
windowAccess, ApplicationServerManager appServerManager, PortletCache portletCache )
{
- super(webAppsDir, registry, entityAccess, windowAccess, portletCache);
+ super(webAppsDir, registry, entityAccess, windowAccess, portletCache,
appServerManager);
ArgUtil.assertNotNull(ApplicationServerManager.class, appServerManager,
this);
- this.appServerManager = appServerManager;
}
public void start()
1.40 +16 -8
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
Index: FileSystemPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- FileSystemPAM.java 3 Aug 2004 05:08:23 -0000 1.39
+++ FileSystemPAM.java 4 Aug 2004 04:01:00 -0000 1.40
@@ -38,11 +38,10 @@
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
+import
org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
import org.apache.jetspeed.util.ArgUtil;
import org.apache.jetspeed.util.DirectoryHelper;
import org.apache.jetspeed.util.FileSystemHelper;
-import org.apache.jetspeed.util.descriptor.ExtendedPortletMetadata;
-import org.apache.jetspeed.util.descriptor.MetaDataException;
import org.apache.jetspeed.util.descriptor.PortletApplicationDescriptor;
import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
import org.apache.jetspeed.util.descriptor.WebApplicationDescriptor;
@@ -80,17 +79,25 @@
protected PortletWindowAccessor windowAccess;
private PortletCache portletCache;
- public FileSystemPAM( String webAppsDir, PortletRegistryComponent registry,
- PortletEntityAccessComponent entityAccess, PortletWindowAccessor
windowAccess, PortletCache portletCache )
+ protected ApplicationServerManager appServerManager;
+
+ public FileSystemPAM( String webAppsDir,
+ PortletRegistryComponent registry,
+ PortletEntityAccessComponent entityAccess,
+ PortletWindowAccessor windowAccess,
+ PortletCache portletCache,
+ ApplicationServerManager appServerManager)
{
super();
ArgUtil.assertNotNull(PortletRegistryComponent.class, registry, this);
ArgUtil.assertNotNull(PortletEntityAccessComponent.class, entityAccess,
this);
+ ArgUtil.assertNotNull(ApplicationServerManager.class, appServerManager,
this);
this.registry = registry;
this.entityAccess = entityAccess;
this.webAppsDir = webAppsDir;
this.portletCache = portletCache;
this.windowAccess = windowAccess;
+ this.appServerManager = appServerManager;
}
/**
@@ -260,10 +267,11 @@
int nState = DEPLOY_WAR; //Initialize
MutablePortletApplication app = null;
String paName = paWar.getPortletApplicationName();
-
+ String targetAppName = appServerManager.getAppServerTarget(paName);
+
try
{
- String portletAppDirectory = webAppsDir + "/" + paName;
+ String portletAppDirectory = webAppsDir + "/" + targetAppName;
log.info("Portlet application deployment target directory is " +
portletAppDirectory);
@@ -324,7 +332,7 @@
}
}
-
+
protected void registerApplication( PortletApplicationWar paWar ) throws
PortletApplicationException,
RegistryException
{
1.4 +9 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/ApplicationServerManager.java
Index: ApplicationServerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/ApplicationServerManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationServerManager.java 15 Jul 2004 14:30:11 -0000 1.3
+++ ApplicationServerManager.java 4 Aug 2004 04:01:00 -0000 1.4
@@ -156,4 +156,12 @@
* @return
*/
boolean isConnected();
+
+ /**
+ * <p> Returns the name of the target directory or archive where the portlet
app will be
+ * deployed as known to the application server
+ * </p>
+ */
+ String getAppServerTarget(String appName);
+
}
1.2 +5 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/JBossManager.java
Index: JBossManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/JBossManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JBossManager.java 1 Aug 2004 19:30:37 -0000 1.1
+++ JBossManager.java 4 Aug 2004 04:01:00 -0000 1.2
@@ -123,4 +123,8 @@
}
+ public String getAppServerTarget(String appName)
+ {
+ return appName + ".war";
+ }
}
1.7 +6 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java
Index: TomcatManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TomcatManager.java 9 Jul 2004 18:29:20 -0000 1.6
+++ TomcatManager.java 4 Aug 2004 04:01:00 -0000 1.7
@@ -328,7 +328,10 @@
*/
public void stop()
{
-
-
+ }
+
+ public String getAppServerTarget(String appName)
+ {
+ return appName;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
