Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'buzz4-30-10' of git@github.com:nimbusproject/nimbus int…

…o buzz4-30-10
  • Loading branch information...
commit e2a0f66b60b34276f4828f221f32f75dbdf1463f 2 parents f3ad68a + d063c3a
BuzzTroll authored
13 .idea-modules/authzdb/authzdb.iml
View
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../authzdb">
+ <sourceFolder url="file://$MODULE_DIR$/../../authzdb/src" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="rm-api-libs" level="project" />
+ </component>
+</module>
+
2  .idea/modules.xml
View
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/authzdb.iml" filepath="$PROJECT_DIR$/authzdb.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea-modules/authzdb//authzdb.iml" filepath="$PROJECT_DIR$/.idea-modules/authzdb//authzdb.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/cloud-client/cloud-client.iml" filepath="$PROJECT_DIR$/.idea-modules/cloud-client/cloud-client.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/protocol-common/common.iml" filepath="$PROJECT_DIR$/.idea-modules/protocol-common/common.iml" group="protocols" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/ctx/contextualization.iml" filepath="$PROJECT_DIR$/.idea-modules/ctx/contextualization.iml" />
18 authzdb.iml
View
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$/authzdb">
- <sourceFolder url="file://$MODULE_DIR$/authzdb/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="spring-3.0.0 (4)" level="project" />
- </component>
-</module>
-
2  authzdb/build.xml
View
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project default="dist" basedir="." name="Workspace Service">
+<project default="dist" basedir="." name="Authz DB Module">
<description>Authz DB Module</description>
BIN  authzdb/lib/aopalliance.jar
View
Binary file not shown
BIN  authzdb/lib/commons-logging.jar
View
Binary file not shown
BIN  authzdb/lib/spring-aop.jar
View
Binary file not shown
BIN  authzdb/lib/spring-asm.jar
View
Binary file not shown
BIN  authzdb/lib/spring-aspects.jar
View
Binary file not shown
BIN  authzdb/lib/spring-beans.jar
View
Binary file not shown
BIN  authzdb/lib/spring-context.jar
View
Binary file not shown
BIN  authzdb/lib/spring-core.jar
View
Binary file not shown
BIN  authzdb/lib/spring-expression.jar
View
Binary file not shown
BIN  authzdb/lib/spring-instrument.jar
View
Binary file not shown
BIN  authzdb/lib/spring-jdbc.jar
View
Binary file not shown
BIN  authzdb/lib/spring-jms.jar
View
Binary file not shown
BIN  authzdb/lib/spring-orm.jar
View
Binary file not shown
BIN  authzdb/lib/spring-oxm.jar
View
Binary file not shown
BIN  authzdb/lib/spring-tx.jar
View
Binary file not shown
2  messaging/gt4.0/java/gar-builder/build.properties
View
@@ -15,6 +15,7 @@ nimbus.messaging.gt4_0.gar.build.dir=build
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.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
@@ -73,6 +74,7 @@ nimbus.service.main.share.dir=${nimbus.service.main.basedir}/share
nimbus.libservices.dir=../../../../lib/services
nimbus.service.api.dist.dir=${nimbus.service.api.basedir}/dist
+nimbus.authzdbmodule.dist.dir=${nimbus.authzdbmodule.basedir}/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/
4 messaging/gt4.0/java/gar-builder/build.xml
View
@@ -107,6 +107,10 @@
<include name="*.jar"/>
<include name="*LICENSE*"/>
</fileset>
+ <fileset dir="${nimbus.authzdbmodule.dist.dir}">
+ <include name="*.jar"/>
+ <include name="*LICENSE*"/>
+ </fileset>
<fileset dir="${nimbus.service.main.dist.dir}">
<include name="*.jar"/>
<include name="*LICENSE*"/>
Please sign in to comment.
Something went wrong with that request. Please try again.