Packaging fixes

git-svn-id: https://svn.argeo.org/commons/trunk@4434 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index c0cfbcc99fb9a0af8db9448adb0969cf6573ed09..00b2753488101b5bcda44528524e33382f1b0529 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -112,6 +112,11 @@
                        <artifactId>org.argeo.security.activemq</artifactId>
                        <version>0.3.2-SNAPSHOT</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.activemq.broker</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
 
                <!-- Hibernate -->
                <dependency>

diff --git a/server/modules/org.argeo.server.activemq.broker/.project b/server/modules/org.argeo.server.activemq.broker/.project
new file mode 100644 (file)
index 0000000..0dd1ba1
--- /dev/null
+++ b/server/modules/org.argeo.server.activemq.broker/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.server.activemq.broker</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>

diff --git a/server/modules/org.argeo.server.activemq.broker/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.activemq.broker/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..c84159a
--- /dev/null
+++ b/server/modules/org.argeo.server.activemq.broker/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Wed Apr 13 20:39:49 CEST 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

diff --git a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
index e6bb3a472564c1faf28af5096007719a89387b5d..a080421bf9a2dd49753131f3749f61a24583df50 100644 (file)
--- a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
@@ -21,3 +21,5 @@ Import-Package: ietf.params.xml.ns.xmpp_sasl;resolution:=optional,
  org.jabber.protocol.muc;resolution:=optional,
  org.jabber.protocol.muc_user;resolution:=optional,
  org.springframework.beans.factory.config
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Name: ActiveMQ broker

diff --git a/server/modules/org.argeo.server.activemq.broker/build.properties b/server/modules/org.argeo.server.activemq.broker/build.properties
new file mode 100644 (file)
index 0000000..5f22cdd
--- /dev/null
+++ b/server/modules/org.argeo.server.activemq.broker/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
index 88c9cf8fe8a508ffc28dfac38a0e54f1ac0c3cea..352ab51a7db887a061a7e70c7d810b0798d66383 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
@@ -252,6 +252,10 @@ public abstract class ThreadBoundJcrSessionFactory {
        /** Monitors registered thread in order to clean up dead ones. */
        private class MonitoringThread extends Thread {
 
+               public MonitoringThread() {
+                       super("ThreadBound JCR Session Monitor");
+               }
+
                @Override
                public void run() {
                        while (isActive()) {