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
no rest for the wicked (removed container-side rest impl)
  • Loading branch information
timf committed Jul 15, 2010
1 parent 5a05c33 commit bf35e46
Show file tree
Hide file tree
Showing 34 changed files with 1 addition and 2,253 deletions.
Expand Up @@ -57,10 +57,4 @@
<property name="placeholderPrefix" value="$QUERY{" />
</bean>

<bean id="restSettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="$NIMBUS_HOME/services/etc/nimbus/rest/rest.conf" />
<property name="placeholderPrefix" value="$REST{" />
</bean>

</beans>
12 changes: 0 additions & 12 deletions messaging/gt4.0-elastic/java/msgbridge/etc/elastic/other/main.xml
Expand Up @@ -238,18 +238,6 @@
<property name="springConfigResource" value="$QUERY{query.spring.path}"/>
</bean>

<!-- TODO this should happen somewhere else... -->
<bean id="nimbus-rest.httpserver"
class="org.nimbustools.messaging.rest.RestHttp"
init-method="startListening">
<property name="enabled" value="$REST{rest.enabled}" />
<property name="port" value="$REST{rest.port}" />
<property name="keystoreResource" value="$REST{keystore.path}"/>
<property name="keystorePassword" value="$REST{keystore.password}"/>
<property name="springConfigResource" value="$REST{rest.spring.path}"/>
</bean>


<!--
property sources are concentrated in this file
-->
Expand Down
3 changes: 0 additions & 3 deletions messaging/gt4.0/java/gar-builder/build.properties
Expand Up @@ -19,7 +19,6 @@ 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
nimbus.messaging.rest.basedir=${nimbus.basedir}/messaging/rest/java/source
nimbus.metadata-server.basedir=${nimbus.basedir}/metadata/java/source

##########################################
Expand Down Expand Up @@ -59,7 +58,6 @@ nimbus.messaging.gt4_0.gar.build.packages.xml=../../../../scripts/lib/gt4.0/buil
nimbus.service.main.etc.dir=${nimbus.service.main.basedir}/etc
nimbus.messaging.gt4_0-elastic.etc.dir=${nimbus.messaging.gt4_0-elastic.basedir}/msgbridge/etc
nimbus.messaging.query.etc.dir=${nimbus.messaging.query.basedir}/etc
nimbus.messaging.rest.etc.dir=${nimbus.messaging.rest.basedir}/etc
nimbus.messaging.gt4_0.gar.etc.dir=etc


Expand All @@ -83,7 +81,6 @@ nimbus.messaging.gt4_0.common.dist.dir=${nimbus.messaging.gt4_0.basedir}/common/
nimbus.messaging.gt4_0.msgbridge.dist.dir=${nimbus.messaging.gt4_0.basedir}/msgbridge/dist/
nimbus.messaging.gt4_0-elastic.msgbridge.dist.dir=${nimbus.messaging.gt4_0-elastic.basedir}/msgbridge/dist/
nimbus.messaging.query.dist.dir=${nimbus.messaging.query.basedir}/dist/
nimbus.messaging.rest.dist.dir=${nimbus.messaging.rest.basedir}/dist/

# you can override this in ~/nimbus.build.properties
nimbus.java.compilerarg=-nowarn
Expand Down
7 changes: 0 additions & 7 deletions messaging/gt4.0/java/gar-builder/build.xml
Expand Up @@ -136,10 +136,6 @@
<include name="*.jar"/>
<include name="*LICENSE*"/>
</fileset>
<fileset dir="${nimbus.messaging.rest.dist.dir}">
<include name="*.jar"/>
<include name="*LICENSE*"/>
</fileset>
</copy>
</target>

Expand All @@ -158,9 +154,6 @@
<copy todir="${nimbus.messaging.gt4_0.gar.build.etc.dir}">
<fileset dir="${nimbus.messaging.query.etc.dir}" />
</copy>
<copy todir="${nimbus.messaging.gt4_0.gar.build.etc.dir}">
<fileset dir="${nimbus.messaging.rest.etc.dir}" />
</copy>
<copy todir="${nimbus.messaging.gt4_0.gar.build.etc.dir}">
<fileset dir="${nimbus.messaging.gt4_0.gar.etc.dir}" />
</copy>
Expand Down
3 changes: 0 additions & 3 deletions messaging/gt4.0/java/gar-builder/etc/post-deploy.xml
Expand Up @@ -26,9 +26,6 @@
<property name="query.conf.dir"
value="${base.conf.dir}/query" />

<property name="rest.conf.dir"
value="${base.conf.dir}/rest" />

<property name="workspace.persistence.dir"
value="${deploy.dir}/var/${base.package.name}" />

Expand Down
20 changes: 0 additions & 20 deletions messaging/rest/java/source/build.properties

This file was deleted.

159 changes: 0 additions & 159 deletions messaging/rest/java/source/build.xml

This file was deleted.

77 changes: 0 additions & 77 deletions messaging/rest/java/source/etc/rest/other/main-fake.xml

This file was deleted.

28 changes: 0 additions & 28 deletions messaging/rest/java/source/etc/rest/other/main.conflocator.xml

This file was deleted.

0 comments on commit bf35e46

Please sign in to comment.