 |
Page History
...
| No Format | ||
|---|---|---|
| ||
Index: install.properties
===================================================================
--- install.properties (revision 7040)
+++ install.properties (revision 7192)
@@ -118,12 +118,20 @@
po-grid.jboss.snmp-trapd.port=21362
po-grid.jboss.web.service.port=28283
#used to allow the po-grid to make EJB3 calls via jndi
-pogrid.jndi.principal=ejbclient
-pogrid.jndi.credentials=pass
+pogrid.jndi.principal=Gr1DU5er
+pogrid.jndi.credentials=Pa44Wurd
-pogrid.jboss.external.http.host=localhost
-pogrid.jboss.external.http.port=29280
+pogrid.jboss.external.http.host=${pogrid.grid.external.secure.host}
+pogrid.jboss.external.http.port=${pogrid.grid.secure.port}
+pogrid.grid.secure.enable=true
+pogrid.grid.secure.port=29443
+pogrid.grid.secure.cert.location=${user.home}/.cagrid/certificates/${pogrid.grid.external.secure.host}-cert.pem
+pogrid.grid.secure.key.location=${user.home}/.cagrid/certificates/${pogrid.grid.external.secure.host}-key.pem
+pogrid.grid.external.secure.host=${env.HOSTNAME}
+pogrid.grid.external.secure.port=29443
+
+
po-grid-legacy.jboss.server.name=pogridlegacy
po-grid-legacy.jboss.server.jndi.port=21099
po-grid-legacy.jboss.server.port=29080
@@ -178,7 +186,7 @@
#grid.index.url=http://training03.cagrid.org:6080/wsrf/services/DefaultIndexService
#grid.index.url=http://cagrid-index-stage.nci.nih.gov:8080/wsrf/services/DefaultIndexService
# Development Grid
-grid.index.url=http://cbiovdev5012.nci.nih.gov:8080/wsrf/services/DefaultIndexService
+grid.index.url=http://index.training.cagrid.org:8080/wsrf/services/DefaultIndexService
grid.poc.tech.researchCenter.displayname=CBIIT
grid.poc.tech.researchCenter.shortname=CBIIT
grid.poc.tech.addr.country=USA
@@ -205,8 +213,16 @@
grid.secure.key.location=${security.dist.relative.dir}/165.112.132.171-key.pem
grid.external.secure.host=
grid.external.secure.port=
+# This is used to download the targets for the grid, it is used by the *.grid.secure functionality. May get the grid.index.url from here in the future
+#grid.target=nci_prod-1.3
+#grid.target=nci_qa-1.3
+#grid.target=nci_stage-1.3
+#grid.target=training-1.3
+grid.target=training-1.3
+jboss.http-connector.remove=true
+
###################################
# PRE-POST VALIDATION PROPERTIES #
###################################
Index: project.properties
===================================================================
--- project.properties (revision 7040)
+++ project.properties (revision 7192)
@@ -14,7 +14,7 @@
ignore.check.database=true
require.build.wscore=true
-bda.version=0.10.4
+bda.version=0.10.9
# Must correspond to versions specified w/in ../po/services/pom.xml
po-services.version=3.0-SNAPSHOT
@@ -61,6 +61,12 @@
ws-core.binaries.relative.dir=ws-core-4.0.3
wscore.relative.dir=ws-core-4.0.3
+sync-gts.binaries.file=gaards-syncgts-1.3.0.1-bin.zip
+sync-gts.src.url=http://software.cagrid.org/gaards/1.3.0.1/${sync-gts.binaries.file}
+sync-gts.binaries.relative.dir=.
+#$SYNCGTS_LOCATION needs to be set in env to point to extracted location
+cagrid-target.src.url=https://ncisvn.nci.nih.gov/svn/cagrid/branches/caGrid-1_3_release/cagrid-1-0/caGrid/repository/caGrid/target_grid
+
findbugs.binaries.file=findbugs-1.3.4.zip
findbugs.src.url=http://gforge.nci.nih.gov/svnroot/commonlibrary/trunk/other/os-independent/${findbugs.binaries.file}
findbugs.binaries.relative.dir=findbugs-1.3.4
@@ -78,6 +84,7 @@
db.dist.relative.dir=db
db-install.dist.relative.dir=db/db-install
db-upgrade.dist.relative.dir=db/db-upgrade
+sync-gts.dist.relative.dir=sync-gts
#*******************************
# Databases build/install properties
Index: upgrade.properties
===================================================================
--- upgrade.properties (revision 7040)
+++ upgrade.properties (revision 7192)
@@ -51,11 +51,18 @@
po-grid.jboss.server.jndi.port=21299
po-grid.jboss.server.port=29280
#used to allow the po-grid to make EJB3 calls via jndi
-pogrid.jndi.principal=ejbclient
-pogrid.jndi.credentials=pass
-pogrid.jboss.external.http.host=localhost
-pogrid.jboss.external.http.port=29280
+pogrid.jndi.principal=Gr1DU5er
+pogrid.jndi.credentials=Pa44Wurd
+pogrid.jboss.external.http.host=${pogrid.grid.external.secure.host}
+pogrid.jboss.external.http.port=${pogrid.grid.secure.port}
+pogrid.grid.secure.enable=true
+pogrid.grid.secure.port=29443
+pogrid.grid.secure.cert.location=${user.home}/.cagrid/certificates/${pogrid.grid.external.secure.host}-cert.pem
+pogrid.grid.secure.key.location=${user.home}/.cagrid/certificates/${pogrid.grid.external.secure.host}-key.pem
+pogrid.grid.external.secure.host=${env.HOSTNAME}
+pogrid.grid.external.secure.port=29443
+
po-grid-legacy.jboss.server.name=pogridlegacy
po-grid-legacy.jboss.server.jndi.port=21099
po-grid-legacy.jboss.server.port=29080
@@ -76,7 +83,7 @@
#grid.index.url=http://training03.cagrid.org:6080/wsrf/services/DefaultIndexService
#grid.index.url=http://cagrid-index-stage.nci.nih.gov:8080/wsrf/services/DefaultIndexService
# Development Grid
-grid.index.url=http://cbiovdev5012.nci.nih.gov:8080/wsrf/services/DefaultIndexService
+grid.index.url=http://index.training.cagrid.org:8080/wsrf/services/DefaultIndexService
grid.poc.tech.researchCenter.displayname=CBIIT
grid.poc.tech.researchCenter.shortname=CBIIT
grid.poc.tech.addr.country=USA
@@ -103,7 +110,15 @@
grid.secure.key.location=${security.dist.relative.dir}/165.112.132.171-key.pem
grid.external.secure.host=
grid.external.secure.port=
+# This is used to download the targets for the grid, it is used by the *.grid.secure functionality. May get the grid.index.url from here in the future
+#grid.target=nci_prod-1.3
+#grid.target=nci_qa-1.3
+#grid.target=nci_stage-1.3
+#grid.target=training-1.3
+grid.target=training-1.3
+jboss.http-connector.remove=true
+
##############
### LDAP ###
##############
Index: install.xml
===================================================================
--- install.xml (revision 7040)
+++ install.xml (revision 7192)
@@ -85,7 +85,13 @@
<!-- Jboss configurtion related properties -->
<property name="jboss.binding.template.location" value="${bda-utils.dir}/resource/${jboss.template.relative.dir}/bindings.xml"/>
<property name="jboss.service.template.location" value="${bda-utils.dir}/resource/${jboss.template.relative.dir}/jboss-service.xml"/>
+ <!-- added for updated secure grid ssaksa 090826 -->
+ <property name="sync-gts.dir" location="${basedir}/${sync-gts.dist.relative.dir}"/>
+ <property name="sync-gts.build.dir" location="${sync-gts.dir}/syncgts"/>
+ <property name="cagrid-target.dir" location="${sync-gts.dir}/cagrid-target"/>
+ <property name="grid.dir.dest.jboss" value="wsrf.war" />
+
<!-- *-ds.xml and WAR -->
<property name="po-ear.dir.dist" value="${basedir}/${po-ear.dist.relative.dir}" />
<property name="po-ear.ds.file" value="po-ds.xml" />
@@ -93,6 +99,7 @@
<property name="po-ear.hibernate.file" value="hibernate.cfg.xml" />
<property name="po-ear.ear.file" value="po.ear" />
+
<!-- Default to false, properties can override -->
<property name="grid.secure.enable" value="false"/>
<property name="jboss.ssl.enable" value="false"/>
@@ -203,7 +210,11 @@
<basename file="${grid.secure.cert.location}" property="grid.secure.cert.file"/>
<dirname file="${grid.secure.cert.location}" property="grid.secure.dir"/>
<basename file="${grid.secure.key.location}" property="grid.secure.key.file"/>
-
+
+ <basename file="${pogrid.grid.secure.cert.location}" property="pogrid.grid.secure.cert.file"/>
+ <dirname file="${pogrid.grid.secure.cert.location}" property="pogrid.grid.secure.dir"/>
+ <basename file="${pogrid.grid.secure.key.location}" property="pogrid.grid.secure.key.file"/>
+
<!-- There is any issue with copying files with a filtersfile, any properties with a value of
another property do not get expanded (xx=${yy} <at:var at:name="xx" /> will be replaced with ${yy} not the
value). I have defined a filter set below for these properties, I then two two copies
@@ -494,6 +505,8 @@
<!-- Configures installed po-grid application -->
<target name="install:po-grid:configure" description="Configure po-grid service based on properties" unless="exclude.po-grid">
<grid-appserver-configure
+ appserver.home="${jboss.home}"
+ appserver.server.name="${po-grid.jboss.server.name}"
appserver.conf.dir="${jboss.home}/server/${po-grid.jboss.server.name}/conf"
appserver.webapp.dir="${jboss.home}/server/${po-grid.jboss.server.name}/deploy"
appserver.server-xml.file="${jboss.home}/server/${po-grid.jboss.server.name}/deploy/jbossweb-tomcat55.sar/server.xml"
@@ -505,7 +518,13 @@
search.port="8080"
grid.application.name="${po-grid.introduce.skeleton.service.name}"
grid.application.relative.dir="${po-grid.dir.target}"
- grid.secure.enable="false"
+ grid.secure.dir="${pogrid.grid.secure.dir}"
+ grid.secure.enable="${pogrid.grid.secure.enable}"
+ grid.secure.port="${pogrid.grid.secure.port}"
+ grid.secure.key.file="${pogrid.grid.secure.key.file}"
+ grid.secure.cert.file="${pogrid.grid.secure.cert.file}"
+ grid.external.secure.host="${pogrid.grid.external.secure.host}"
+ grid.external.secure.port="${pogrid.grid.external.secure.port}"
appserver.external.http.host="${pogrid.jboss.external.http.host}"
/>
</target>
@@ -587,6 +606,7 @@
grid.secure.key.file="${grid.secure.key.file}"
grid.secure.cert.file="${grid.secure.cert.file}"
jboss.java.opts="${jboss.java.opts}"
+ jboss.http-connector.remove="false"
/>
</target>
@@ -597,7 +617,7 @@
filtering="true"
overwrite="true">
<filterset begintoken="@" endtoken="@">
- <filter token="jboss.server.port" value="@po-grid.jboss.server.port@"/>
+ <filter token="jboss.server.port" value="@pogrid.grid.secure.port@"/>
<filter token="jboss.ejbinvoker.port" value="@po-grid.jboss.ejbinvoker.port@"/>
<filter token="jboss.server.rmi.port" value="@po-grid.jboss.server.rmi.port@"/>
<filter token="jboss.server.jndi.port" value="@po-grid.jboss.server.jndi.port@"/>
@@ -649,16 +669,17 @@
jboss.external.http.host="${pogrid.jboss.external.http.host}"
jboss.external.http.port="${pogrid.jboss.external.http.port}"
proxy.update.connector.port.http="8080"
- grid.external.secure.host="${grid.external.secure.host}"
- grid.external.secure.port="${grid.external.secure.port}"
+ grid.external.secure.host="${pogrid.grid.external.secure.host}"
+ grid.external.secure.port="${pogrid.grid.external.secure.port}"
jboss.server.hostname="${jboss.server.hostname}"
- jboss.grid.configure="false"
- grid.secure.dir="${grid.secure.dir}"
- grid.secure.enable="${grid.secure.enable}"
- grid.secure.port="${grid.secure.port}"
- grid.secure.key.file="${grid.secure.key.file}"
- grid.secure.cert.file="${grid.secure.cert.file}"
+ jboss.grid.configure="true"
+ grid.secure.dir="${pogrid.grid.secure.dir}"
+ grid.secure.enable="${pogrid.grid.secure.enable}"
+ grid.secure.port="${pogrid.grid.secure.port}"
+ grid.secure.key.file="${pogrid.grid.secure.key.file}"
+ grid.secure.cert.file="${pogrid.grid.secure.cert.file}"
jboss.java.opts="${jboss.java.opts}"
+ jboss.http-connector.remove="true"
/>
</target>
@@ -731,6 +752,7 @@
grid.secure.key.file="${grid.secure.key.file}"
grid.secure.cert.file="${grid.secure.cert.file}"
jboss.java.opts="${jboss.java.opts}"
+ jboss.http-connector.remove="false"
/>
</target>
Index: common/resources/grid/jboss-globus-libs-cagrid1_1.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: build.xml
===================================================================
--- build.xml (revision 7040)
+++ build.xml (revision 7192)
@@ -204,6 +204,14 @@
</default>
</switch>
+ <if>
+ <not>
+ <isset property="env.ANT_OPTS"/>
+ </not>
+ <then>
+ <fail message="To build this project you need to specify a increased java memory settings.${line.separator}export ANT_OPTS='-Xms256m -Xmx1024m -XX\:PermSize\=128m -XX\:MaxPermSize\=512m' # for Linux or MAC${line.separator} set ANT_OPTS='-Xms256m -Xmx1024m -XX\:PermSize\=128m -XX\:MaxPermSize\=512m' # for windows."/>
+ </then>
+ </if>
<!-- Targets -->
<target name="diagnostics" description="diagnostics">
<echoproperties/>
@@ -447,9 +455,44 @@
depends="
init,
dist:tools:retrieve:jboss,
- dist:tools:retrieve:jboss-bindings
+ dist:tools:retrieve:jboss-bindings,
+ dist:tools:retrieve:sync-gts
" />
+ <!--
+ See https://wiki.nci.nih.gov/display/BuildandDeploymentAutomation/How+to+configure+a+Secure+Grid+Listener for more details
+ -->
+ <target name="dist:tools:retrieve:sync-gts" description="Downloads caGrid SyncGTS service file from binary repository and verifies checksum">
+ <if>
+ <not>
+ <available file="${download.dir}/${sync-gts.binaries.file}"/>
+ </not>
+ <then>
+ <get src="${sync-gts.src.url}" dest="${download.dir}/${sync-gts.binaries.file}" />
+ </then>
+ </if>
+ <property name="sync-gts.dist.dir" location="${dist.exploded.dir}/${sync-gts.dist.relative.dir}"/>
+ <unzip src="${download.dir}/${sync-gts.binaries.file}" dest="${sync-gts.dist.dir}"/>
+ <property name="cagrid.target.co.dir" location="${target.dir}/cagrid-target"/>
+ <mkdir dir="${cagrid.target.co.dir}"/>
+ <if>
+ <not>
+ <available file="${cagrid-target.src.url}"/>
+ </not>
+ <then>
+ <mkdir dir="${cagrid.target.co.dir}"/>
+ <svn-co
+ svn.checkout.url="${cagrid-target.src.url}"
+ svn.checkout.dir="${cagrid.target.co.dir}"
+ delete="false"
+ />
+ </then>
+ </if>
+ <copy todir="${sync-gts.dist.dir}/cagrid-target">
+ <fileset dir="${cagrid.target.co.dir}"/>
+ </copy>
+ </target>
+
<target name="dist:tools:retrieve:jboss-bindings" description="Downloads JBOSS bindings filefrom binary repository and verifies checksum">
<get src="${jboss-bindings.src.url}" dest="${dist.exploded.dir}/${jboss-bindings.file}" />
</target>
@@ -513,7 +556,7 @@
</target>
<!-- Copies install time resources into distribution tree -->
- <target name="dist:upgrader:prep">
+ <target name="dist:upgrader:prep" depends="dist:tools:retrieve:sync-gts">
<!-- Copy po database scripts -->
<copy todir="${dist.exploded.dir}/${db.dist.relative.dir}" overwrite="true">
<fileset dir="${db.src.dir}">
|
...
