Changeset 2706

Timestamp:

01/22/10 14:56:39

Author:

douglm

Message:

Fix up resource deployment in jboss

Delete another unused jboss directory

Files:

• trunk/config/bwbuild/jboss/build.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss/cal.properties (modified) (8 diffs)
• trunk/deployment/webpublic/jboss (deleted)

trunk/config/bwbuild/jboss/build.properties

@@ -16 +16 @@
-compile.debug=yes
-
-org.bedework.appserver.dir=${user.home}/drop2/jboss/jboss-4.2.2.GA
-
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-org.bedework.config.home=${env.BEDEWORK_CONFIG}

trunk/config/bwbuild/jboss/cal.properties

@@ -103 +103 @@
-
-#  where the application server lives
-4.2.2
+5.1.0
-
-# name of jboss configuration we are using
-prod
+default
-
-# location of jboss configuration we are using
@@ -125 +125 @@
-log4j.config.destination=${org.bedework.appserver.dir}/common/classes
-
-default web application
-webapp.root.dir=${org.bedework.jboss.config.dir}/deploy/jboss-web.deployer
+server static resources, relative to the application server home
+org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy
-
-#  If jetspeed2 builds are enabled this is where we deploy
@@ -195 +195 @@
-org.bedework.app.bwconfig.war.name=bwconfig
-org.bedework.app.bwconfig.context.root=/bwconfig
-server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war
+${org.bedework.server.resource.root.dir}
-org.bedework.app.bwconfig.deploy.dir=/webapps
-org.bedework.app.bwconfig.description=Bedework properties config application
@@ -218 +218 @@
-# Set for jboss
-#org.bedework.app.CalAdmin.virtual.host=
-server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war
+${org.bedework.server.resource.root.dir}
-org.bedework.app.CalAdmin.deploy.dir=/webapps
-
@@ -245 +245 @@
-# Set for jboss
-#org.bedework.app.EventSubmit.virtual.host=
-server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war
+${org.bedework.server.resource.root.dir}
-org.bedework.app.EventSubmit.deploy.dir=/webapps
-
@@ -272 +272 @@
-# Set for jboss
-#org.bedework.app.Events.virtual.host=
-server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war
+${org.bedework.server.resource.root.dir}
-org.bedework.app.Events.deploy.dir=/webapps
-org.bedework.app.Events.cal.suite=MainCampus
@@ -296 +296 @@
-# Set for jboss
-#org.bedework.app.SoEDept.virtual.host=
-server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war
+${org.bedework.server.resource.root.dir}
-org.bedework.app.SoEDept.deploy.dir=/webapps
-org.bedework.app.SoEDept.cal.suite=SoEDepartmental
@@ -320 +320 @@
-# Set for jboss
-#org.bedework.app.UserCal.virtual.host=
-server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war
+${org.bedework.server.resource.root.dir}
-org.bedework.app.UserCal.deploy.dir=/webapps
-