Author: sheetal
Date: Fri Nov 20 23:20:50 2009
New Revision: 882775
URL: http://svn.apache.org/viewvc?rev=882775&view=rev
Log:
OLIO-134 Modified the build script to be generic
Added:
incubator/olio/webapp/java/trunk/ws/bp-project/app-server.properties.template
incubator/olio/webapp/java/trunk/ws/bp-project/build.properties
incubator/olio/webapp/java/trunk/ws/bp-project/glassfish-app-server.properties
- copied unchanged from r830735,
incubator/olio/webapp/java/trunk/ws/bp-project/app-server.properties
incubator/olio/webapp/java/trunk/ws/bp-project/weblogic-app-server.properties
Modified:
incubator/olio/webapp/java/trunk/ws/bp-project/command-line-ant-tasks.xml
Added:
incubator/olio/webapp/java/trunk/ws/bp-project/app-server.properties.template
URL:
http://svn.apache.org/viewvc/incubator/olio/webapp/java/trunk/ws/bp-project/app-server.properties.template?rev=882775&view=auto
==============================================================================
---
incubator/olio/webapp/java/trunk/ws/bp-project/app-server.properties.template
(added)
+++
incubator/olio/webapp/java/trunk/ws/bp-project/app-server.properties.template
Fri Nov 20 23:20:50 2009
@@ -0,0 +1,59 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+#default values for the app-serverjavaee.server.name=localhost
+javaee.server.name=localhost
+javaee.adminserver.name=${javaee.server.name}
+javaee.server.port=8080
+javaee.adminserver.port=4848
+javaee.orb.port=3700
+javaee.home=/space/binu/glassfishv2_u1/glassfish
+javaee.server.passwordfile=${javaee.home}/samples/bp-project/passwordfile
+appserver.instance=server
+javaee.jar=${javaee.home}/lib/javaee.jar
+javaee.server.username=admin
+javaee.domaindir=${javaee.home}/domains/domain1
+
+#default values for the J2EE 1.4 app-server (for backward compatibility)
+j2ee.server.name=${javaee.server.name}
+j2ee.adminserver.name=${j2ee.server.name}
+j2ee.server.port=${javaee.server.port}
+j2ee.adminserver.port=${javaee.adminserver.port}
+j2ee.server.username=${javaee.server.username}
+# application client container
+client.jar.dir=client-jar
+ac.jar=appClient.jar
+
+# default properties for the javadb database
+#
+# db.home defines where the database needs to be created
+# which is different from db.root
+#
+db.delimiter=;
+db.home=${javaee.home}/javadb
+db.root=${db.home}
+db.driver=org.apache.derby.jdbc.ClientDriver
+db.datasource=org.apache.derby.jdbc.ClientDataSource
+db.port=1527
+db.sid=sun-appserv-samples
+db.user=APP
+db.password=APP
+db.jvmargs=-ms16m -mx32m
+db.url=jdbc:derby://${javaee.server.name}:${db.port}/${db.sid};create=true;
+db.vendorname=SQL92
+
Added: incubator/olio/webapp/java/trunk/ws/bp-project/build.properties
URL:
http://svn.apache.org/viewvc/incubator/olio/webapp/java/trunk/ws/bp-project/build.properties?rev=882775&view=auto
==============================================================================
--- incubator/olio/webapp/java/trunk/ws/bp-project/build.properties (added)
+++ incubator/olio/webapp/java/trunk/ws/bp-project/build.properties Fri Nov 20
23:20:50 2009
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+
+#Specify the appserver name and create <appservername>-app-server.properties
+#with all the details
+javaee.server.type=glassfish
+
+# for platforms other than Windows and MAC
+# Uncomment and set this property to the location of the browser you
+# choose to launch when an application is deployed.
+# On Windows and Mac OS X the default browser is used.
+#default.browser=/Applications/Firefox.app/Contents/MacOS/firefox-bin
Modified:
incubator/olio/webapp/java/trunk/ws/bp-project/command-line-ant-tasks.xml
URL:
http://svn.apache.org/viewvc/incubator/olio/webapp/java/trunk/ws/bp-project/command-line-ant-tasks.xml?rev=882775&r1=882774&r2=882775&view=diff
==============================================================================
--- incubator/olio/webapp/java/trunk/ws/bp-project/command-line-ant-tasks.xml
(original)
+++ incubator/olio/webapp/java/trunk/ws/bp-project/command-line-ant-tasks.xml
Fri Nov 20 23:20:50 2009
@@ -25,6 +25,7 @@
<project name="command-line-ant-tasks" default="default">
<import
file="${ant.file.command-line-ant-tasks}/../common-properties.xml"/>
+
<import file="${ant.file.command-line-ant-tasks}/../app-server-ant.xml"/>
<condition property="module-tasks-file"
value="${ant.file.command-line-ant-tasks}/../jar-ant.xml">
@@ -70,8 +71,9 @@
description="compiles the project"/>
<dirname property="antfile.dir" file="${ant.file}"/>
+
<path id="classpath">
- <fileset dir="${javaee.home}" includes="lib/javaee.jar,
lib/appserv-rt.jar, lib/appserv-ws.jar"/>
+ <fileset dir="${javaee.lib.dir}" includes="*.jar"/>
<fileset dir="../../lib" includes="*.jar"/>
<!-- include jersey jars now -->
<fileset dir="../../lib/jersey" includes="*.jar"/>
Added:
incubator/olio/webapp/java/trunk/ws/bp-project/weblogic-app-server.properties
URL:
http://svn.apache.org/viewvc/incubator/olio/webapp/java/trunk/ws/bp-project/weblogic-app-server.properties?rev=882775&view=auto
==============================================================================
---
incubator/olio/webapp/java/trunk/ws/bp-project/weblogic-app-server.properties
(added)
+++
incubator/olio/webapp/java/trunk/ws/bp-project/weblogic-app-server.properties
Fri Nov 20 23:20:50 2009
@@ -0,0 +1,58 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+#default values for the app-serverjavaee.server.name=localhost
+javaee.server.name=localhost
+javaee.adminserver.name=${javaee.server.name}
+javaee.server.port=7001
+javaee.adminserver.port=7001
+javaee.home=/oraclefmw/
+javaee.lib.dir=${javaee.home}/modules/
+appserver.instance=server
+javaee.jar=${javaee.home}/modules/
+javaee.server.username=weblogic
+javaee.domaindir=${javaee.home}/wlserver_10.3/samples/domains/wl_server
+
+#default values for the J2EE 1.4 app-server (for backward compatibility)
+j2ee.server.name=${javaee.server.name}
+j2ee.adminserver.name=${j2ee.server.name}
+j2ee.server.port=${javaee.server.port}
+j2ee.adminserver.port=${javaee.adminserver.port}
+j2ee.server.username=${javaee.server.username}
+# application client container
+client.jar.dir=client-jar
+ac.jar=appClient.jar
+
+# default properties for the javadb database
+#
+# db.home defines where the database needs to be created
+# which is different from db.root
+#
+db.delimiter=;
+db.home=${javaee.home}/javadb
+db.root=${db.home}
+db.driver=org.apache.derby.jdbc.ClientDriver
+db.datasource=org.apache.derby.jdbc.ClientDataSource
+db.port=1527
+db.sid=sun-appserv-samples
+db.user=APP
+db.password=APP
+db.jvmargs=-ms16m -mx32m
+db.url=jdbc:derby://${javaee.server.name}:${db.port}/${db.sid};create=true;
+db.vendorname=SQL92
+
