Skip to content
This repository has been archived by the owner on Sep 23, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
lib/workspaceservice is for jars in lib/services that are only used b…
…y IaaS
  • Loading branch information
timf committed Jun 10, 2011
1 parent ade5d7b commit 5550a88
Show file tree
Hide file tree
Showing 24 changed files with 66 additions and 71 deletions.
9 changes: 4 additions & 5 deletions .idea-modules/ctx/contextualization.iml
Expand Up @@ -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>

3 changes: 2 additions & 1 deletion .idea-modules/query/ec2query.iml
Expand Up @@ -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>

2 changes: 1 addition & 1 deletion .idea-modules/service-suites/tests-common.iml
Expand Up @@ -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>

3 changes: 2 additions & 1 deletion .idea-modules/wrksp-svc/workspace-service.iml
Expand Up @@ -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>

15 changes: 0 additions & 15 deletions .idea/libraries/ctxbroker_libs.xml

This file was deleted.

29 changes: 0 additions & 29 deletions .idea/libraries/workspace_service_libs.xml

This file was deleted.

1 change: 1 addition & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 6 additions & 2 deletions messaging/gt4.0/java/gar-builder/build.properties
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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/
Expand Down
56 changes: 40 additions & 16 deletions messaging/gt4.0/java/gar-builder/build.xml
Expand Up @@ -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...
Expand Down Expand Up @@ -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*"/>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -158,7 +183,6 @@
<fileset dir="${nimbus.messaging.gt4_0.gar.etc.dir}" />
</copy>
</target>


<!-- *******************************************************************
COPIES FOR SHARE DIRECTORY
Expand Down Expand Up @@ -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">

Expand Down
1 change: 1 addition & 0 deletions metadata/java/source/build.properties
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions metadata/java/source/build.xml
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion service/service/java/source/build.properties
Expand Up @@ -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/
Expand Down
3 changes: 3 additions & 0 deletions service/service/java/source/build.xml
Expand Up @@ -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>
Expand Down

0 comments on commit 5550a88

Please sign in to comment.