Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

lib/workspaceservice is for jars in lib/services that are only used b…

…y IaaS
  • Loading branch information...
commit 5550a881f3195e95b363374ecd5bafbc4d2d2bae 1 parent ade5d7b
@timf timf authored
Showing with 66 additions and 71 deletions.
  1. +4 −5 .idea-modules/ctx/contextualization.iml
  2. +2 −1  .idea-modules/query/ec2query.iml
  3. +1 −1  .idea-modules/service-suites/tests-common.iml
  4. +2 −1  .idea-modules/wrksp-svc/workspace-service.iml
  5. +0 −15 .idea/libraries/ctxbroker_libs.xml
  6. +0 −29 .idea/libraries/workspace_service_libs.xml
  7. +1 −0  .idea/modules.xml
  8. 0  lib/{services → workspaceservice}/commons-dbcp.jar
  9. 0  lib/{services → workspaceservice}/commons-io-1.4.jar
  10. 0  lib/{services → workspaceservice}/commons-pool.jar
  11. 0  lib/{services → workspaceservice}/derby.jar
  12. 0  lib/{services → workspaceservice}/derbyclient.jar
  13. 0  lib/{services → workspaceservice}/derbynet.jar
  14. 0  lib/{services → workspaceservice}/derbyrun.jar
  15. 0  lib/{services → workspaceservice}/derbytools.jar
  16. 0  lib/{services → workspaceservice}/junixsocket-1.3.jar
  17. 0  lib/{services → workspaceservice}/junixsocket-rmi-1.3.jar
  18. 0  lib/{services → workspaceservice}/sqlitejdbc-v056.jar
  19. +6 −2 messaging/gt4.0/java/gar-builder/build.properties
  20. +40 −16 messaging/gt4.0/java/gar-builder/build.xml
  21. +1 −0  metadata/java/source/build.properties
  22. +4 −0 metadata/java/source/build.xml
  23. +2 −1  service/service/java/source/build.properties
  24. +3 −0  service/service/java/source/build.xml
View
9 .idea-modules/ctx/contextualization.iml
@@ -9,13 +9,12 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="ctxbroker-libs" level="project" />
- <orderEntry type="module" module-name="common" />
<orderEntry type="library" name="test-libs" level="project" />
- <orderEntry type="library" name="cxf-libs" level="project" />
- <orderEntry type="module" module-name="ec2query" />
- <orderEntry type="library" name="workspace-service-libs" level="project" />
<orderEntry type="module" module-name="authzdb" />
+ <orderEntry type="module" module-name="query-general" />
+ <orderEntry type="library" name="lib-services" level="project" />
+ <orderEntry type="library" name="generated-libs" level="project" />
+ <orderEntry type="module" module-name="rm-api" />
</component>
</module>
View
3  .idea-modules/query/ec2query.iml
@@ -22,8 +22,9 @@
<orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="ec2soap" />
<orderEntry type="library" name="test-libs" level="project" />
- <orderEntry type="library" name="workspace-service-libs" level="project" />
+ <orderEntry type="library" name="lib-workspaceservice" level="project" />
<orderEntry type="module" module-name="authzdb" />
+ <orderEntry type="module" module-name="query-general" />
</component>
</module>
View
2  .idea-modules/service-suites/tests-common.iml
@@ -10,7 +10,7 @@
<orderEntry type="module" module-name="rm-api" exported="" />
<orderEntry type="module" module-name="workspace-service" exported="" />
<orderEntry type="library" exported="" name="test-libs" level="project" />
- <orderEntry type="library" exported="" name="workspace-service-libs" level="project" />
+ <orderEntry type="library" exported="" name="lib-workspaceservice" level="project" />
</component>
</module>
View
3  .idea-modules/wrksp-svc/workspace-service.iml
@@ -30,10 +30,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="workspace-service-libs" level="project" />
+ <orderEntry type="library" name="lib-workspaceservice" level="project" />
<orderEntry type="module" module-name="rm-api" />
<orderEntry type="library" name="test-libs" level="project" />
<orderEntry type="module" module-name="authzdb" />
+ <orderEntry type="library" name="lib-services" level="project" />
</component>
</module>
View
15 .idea/libraries/ctxbroker_libs.xml
@@ -1,15 +0,0 @@
-<component name="libraryTable">
- <library name="ctxbroker-libs">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/services/jce-jdk13-125.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/cog-jglobus.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/commons-logging.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/wsrf_core.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/axis.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/generated/nimbus-ctx-stubs-gt4.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/addressing-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
View
29 .idea/libraries/workspace_service_libs.xml
@@ -1,29 +0,0 @@
-<component name="libraryTable">
- <library name="workspace-service-libs">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/services/commonj.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/commons-pool.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/commons-dbcp.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/commons-logging.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/servlet.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/derbyclient.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/jetty-6.1.21.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/derbytools.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/derby.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/backport-util-concurrent-3.1-jdk1.4.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/jetty-util-6.1.21.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/jug-2.0.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/commons-collections-3.2.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/commons-io-1.4.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/junixsocket-1.3.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/junixsocket-rmi-1.3.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/commons-cli-2.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/gson-1.4.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/ehcache-core-2.3.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/slf4j-api-1.5.11.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/services/slf4j-jdk14-1.5.11.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
View
1  .idea/modules.xml
@@ -12,6 +12,7 @@
<module fileurl="file://$PROJECT_DIR$/.idea-modules/ec2soap/ec2soap.iml" filepath="$PROJECT_DIR$/.idea-modules/ec2soap/ec2soap.iml" group="protocols" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/service-suites/failure.iml" filepath="$PROJECT_DIR$/.idea-modules/service-suites/failure.iml" group="service-suites" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/installer/installer.iml" filepath="$PROJECT_DIR$/.idea-modules/installer/installer.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea-modules/query-general//query-general.iml" filepath="$PROJECT_DIR$/.idea-modules/query-general//query-general.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/rm-api/rm-api.iml" filepath="$PROJECT_DIR$/.idea-modules/rm-api/rm-api.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/service-suites//spotinstances.iml" filepath="$PROJECT_DIR$/.idea-modules/service-suites//spotinstances.iml" group="service-suites" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/service-suites/tests-common.iml" filepath="$PROJECT_DIR$/.idea-modules/service-suites/tests-common.iml" group="service-suites" />
View
0  lib/services/commons-dbcp.jar → lib/workspaceservice/commons-dbcp.jar
File renamed without changes
View
0  lib/services/commons-io-1.4.jar → lib/workspaceservice/commons-io-1.4.jar
File renamed without changes
View
0  lib/services/commons-pool.jar → lib/workspaceservice/commons-pool.jar
File renamed without changes
View
0  lib/services/derby.jar → lib/workspaceservice/derby.jar
File renamed without changes
View
0  lib/services/derbyclient.jar → lib/workspaceservice/derbyclient.jar
File renamed without changes
View
0  lib/services/derbynet.jar → lib/workspaceservice/derbynet.jar
File renamed without changes
View
0  lib/services/derbyrun.jar → lib/workspaceservice/derbyrun.jar
File renamed without changes
View
0  lib/services/derbytools.jar → lib/workspaceservice/derbytools.jar
File renamed without changes
View
0  lib/services/junixsocket-1.3.jar → lib/workspaceservice/junixsocket-1.3.jar
File renamed without changes
View
0  lib/services/junixsocket-rmi-1.3.jar → lib/workspaceservice/junixsocket-rmi-1.3.jar
File renamed without changes
View
0  lib/services/sqlitejdbc-v056.jar → lib/workspaceservice/sqlitejdbc-v056.jar
File renamed without changes
View
8 messaging/gt4.0/java/gar-builder/build.properties
@@ -2,7 +2,7 @@
# General
#########
-nimbus.messaging.gt4_0.gar.print-noun=Nimbus GT4.0 main GAR package
+nimbus.messaging.gt4_0.gar.print-noun=Nimbus GT4.0 GAR package
nimbus.messaging.gt4_0.gar.package.name=nimbus
nimbus.messaging.gt4_0.gar.dist.dir=dist
nimbus.messaging.gt4_0.gar.build.dir=build
@@ -16,6 +16,7 @@ nimbus.basedir=../../../..
nimbus.service.main.basedir=${nimbus.basedir}/service/service/java/source/
nimbus.service.api.basedir=${nimbus.basedir}/service-api/java/source
nimbus.authzdbmodule.basedir=${nimbus.basedir}/authzdb
+nimbus.autocommon.basedir=${nimbus.basedir}/autocommon
nimbus.messaging.gt4_0.basedir=${nimbus.basedir}/messaging/gt4.0/java
nimbus.messaging.gt4_0-elastic.basedir=${nimbus.basedir}/messaging/gt4.0-elastic/java
nimbus.messaging.query.basedir=${nimbus.basedir}/messaging/query/java/source
@@ -72,9 +73,12 @@ nimbus.service.main.share.dir=${nimbus.service.main.basedir}/share
# Directories of JARs to package into GAR's LIB directory
#########################################################
-nimbus.libservices.dir=../../../../lib/services
+nimbus.libservices.dir=../../../../lib/workspaceservice
+nimbus.baselibservices.dir=../../../../lib/services
nimbus.service.api.dist.dir=${nimbus.service.api.basedir}/dist
nimbus.authzdbmodule.dist.dir=${nimbus.authzdbmodule.basedir}/dist
+nimbus.autocommon.dist.dir=${nimbus.autocommon.basedir}/dist
+nimbus.querygenmodule.dist.dir=${nimbus.basedir}/query/dist
nimbus.service.main.dist.dir=${nimbus.service.main.basedir}/dist
nimbus.metadata-server.dist.dir=${nimbus.metadata-server.basedir}/dist
nimbus.messaging.gt4_0.common.dist.dir=${nimbus.messaging.gt4_0.basedir}/common/dist/
View
56 messaging/gt4.0/java/gar-builder/build.xml
@@ -44,20 +44,24 @@
<fileset dir="${nimbus.messaging.gt4_0.gar.build.lib.dir}" id="garjars"/>
<property name="garjars.id" value="garjars"/>
- <!-- garetc.id -->
- <fileset dir="${nimbus.messaging.gt4_0.gar.build.etc.dir}" id="garEtc"/>
- <property name="garetc.id" value="garEtc"/>
-
<!-- garshare.id -->
<fileset dir="${nimbus.messaging.gt4_0.gar.build.share.dir}" id="garshare"/>
<property name="garshare.id" value="garshare"/>
- <property name="garserverdeployment.file"
- location="${nimbus.messaging.gt4_0.gar.wsddfile}"/>
+ <!-- not used for GAR that broker uses -->
+ <target name="init-deployment-properties">
+
+ <!-- garetc.id -->
+ <fileset dir="${nimbus.messaging.gt4_0.gar.build.etc.dir}" id="garEtc"/>
+ <property name="garetc.id" value="garEtc"/>
+
+ <property name="garserverdeployment.file"
+ location="${nimbus.messaging.gt4_0.gar.wsddfile}"/>
+
+ <property name="garjndiconfigdeployment.file"
+ location="${nimbus.messaging.gt4_0.gar.jndifile}"/>
+ </target>
- <property name="garjndiconfigdeployment.file"
- location="${nimbus.messaging.gt4_0.gar.jndifile}"/>
-
<!-- *********************
unused GAR properties
setting these to avoid build warning messages from GT...
@@ -96,14 +100,32 @@
COPIES FOR LIB DIRECTORY
******************************************************************* -->
- <target name="lib_copies" depends="init">
+ <target name="lib_copies" depends="base_lib_copies">
<copy todir="${nimbus.messaging.gt4_0.gar.build.lib.dir}">
-
+ <fileset dir="${nimbus.service.main.dist.dir}">
+ <include name="*.jar"/>
+ <include name="*LICENSE*"/>
+ </fileset>
+ <fileset dir="${nimbus.metadata-server.dist.dir}">
+ <include name="*.jar"/>
+ <include name="*LICENSE*"/>
+ </fileset>
<fileset dir="${nimbus.libservices.dir}">
<include name="*.jar"/>
<include name="*LICENSE*"/>
</fileset>
+ </copy>
+ </target>
+
+ <target name="base_lib_copies" depends="init">
+
+ <copy todir="${nimbus.messaging.gt4_0.gar.build.lib.dir}">
+
+ <fileset dir="${nimbus.baselibservices.dir}">
+ <include name="*.jar"/>
+ <include name="*LICENSE*"/>
+ </fileset>
<fileset dir="${nimbus.service.api.dist.dir}">
<include name="*.jar"/>
<include name="*LICENSE*"/>
@@ -112,11 +134,11 @@
<include name="*.jar"/>
<include name="*LICENSE*"/>
</fileset>
- <fileset dir="${nimbus.service.main.dist.dir}">
+ <fileset dir="${nimbus.querygenmodule.dist.dir}">
<include name="*.jar"/>
<include name="*LICENSE*"/>
</fileset>
- <fileset dir="${nimbus.metadata-server.dist.dir}">
+ <fileset dir="${nimbus.autocommon.dist.dir}">
<include name="*.jar"/>
<include name="*LICENSE*"/>
</fileset>
@@ -144,10 +166,13 @@
COPIES FOR ETC DIRECTORY
******************************************************************* -->
- <target name="etc_copies" depends="init">
+ <target name="etc_copies" depends="base_etc_copies">
<copy todir="${nimbus.messaging.gt4_0.gar.build.etc.dir}">
<fileset dir="${nimbus.service.main.etc.dir}" />
</copy>
+ </target>
+
+ <target name="base_etc_copies" depends="init">
<copy todir="${nimbus.messaging.gt4_0.gar.build.etc.dir}">
<fileset dir="${nimbus.messaging.gt4_0-elastic.etc.dir}" />
</copy>
@@ -158,7 +183,6 @@
<fileset dir="${nimbus.messaging.gt4_0.gar.etc.dir}" />
</copy>
</target>
-
<!-- *******************************************************************
COPIES FOR SHARE DIRECTORY
@@ -186,7 +210,7 @@
CREATE DISTRIBUTION
******************************************************************* -->
- <target name="_dist" depends="lib_copies, etc_copies, share_copies">
+ <target name="_dist" depends="init-deployment-properties, lib_copies, etc_copies, share_copies">
<ant antfile="${build.packages}" target="makeGar">
View
1  metadata/java/source/build.properties
@@ -7,6 +7,7 @@ nimbus.metadata-server.dist.dir=dist
nimbus.metadata-server.jar.name=nimbus-metadata-server.jar
nimbus.metadata-server.lib.dir=../../../lib/services
+nimbus.metadata-server.lib2.dir=../../../lib/workspaceservice
# Compile dependencies from source tree
nimbus.service.api.dist.dir=../../../service-api/java/source/dist
View
4 metadata/java/source/build.xml
@@ -52,6 +52,10 @@
<include name="*.jar"/>
</fileset>
+ <fileset dir="${nimbus.metadata-server.lib2.dir}">
+ <include name="*.jar"/>
+ </fileset>
+
<fileset dir="${nimbus.service.api.dist.dir}">
<include name="*.jar"/>
</fileset>
View
3  service/service/java/source/build.properties
@@ -6,7 +6,8 @@ nimbus.service.main.src.dir=src
nimbus.service.main.dist.dir=dist
nimbus.service.main.jar.name=nimbus-workspace-service.jar
-nimbus.service.main.lib.dir=../../../../lib/services
+nimbus.service.main.baselib.dir=../../../../lib/services
+nimbus.service.main.lib.dir=../../../../lib/workspaceservice
# Compile dependencies from source tree
nimbus.service.api.dist.dir=../../../../service-api/java/source/dist/
View
3  service/service/java/source/build.xml
@@ -50,6 +50,9 @@
<fileset dir="${nimbus.service.main.lib.dir}">
<include name="*.jar"/>
</fileset>
+ <fileset dir="${nimbus.service.main.baselib.dir}">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="${nimbus.service.api.dist.dir}">
<include name="*.jar"/>
</fileset>
Please sign in to comment.
Something went wrong with that request. Please try again.