You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/11/28 01:21:30 UTC
svn commit: r598828 - in /servicemix/branches/servicemix-4.0:
apache-servicemix/src/main/descriptors/
apache-servicemix/src/main/release/conf/
apache-servicemix/src/main/release/conf/factories/
apache-servicemix/src/main/release/conf/services/ manageme...
Author: gnodet
Date: Tue Nov 27 16:21:27 2007
New Revision: 598828
URL: http://svn.apache.org/viewvc?rev=598828&view=rev
Log:
Use servicemix file monitor instead of pax-confman
Added:
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/org.apache.servicemix.activemq.cfg
- copied unchanged from r598774, servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.activemq.properties
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/org.apache.servicemix.shell.cfg
- copied unchanged from r598774, servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.shell.properties
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/org.apache.servicemix.transaction.cfg
- copied unchanged from r598774, servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.transaction.properties
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/org.ops4j.pax.logging.cfg
- copied unchanged from r598774, servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.ops4j.pax.logging.properties
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/bin/
- copied from r598774, servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/org.apache.servicemix.management.cfg
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/org.apache.servicemix.shell.cfg
- copied unchanged from r598774, servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/services/org.apache.servicemix.shell.properties
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/org.ops4j.pax.logging.cfg
- copied unchanged from r598774, servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/services/org.ops4j.pax.logging.properties
Removed:
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/factories/
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/
servicemix/branches/servicemix-4.0/management/core/src/main/java/org/apache/servicemix/management/IntrospectionSupport.java
servicemix/branches/servicemix-4.0/management/core/src/main/java/org/apache/servicemix/management/JmxConnectorServiceFactory.java
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/factories/
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/services/
Modified:
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/config.properties
servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml
servicemix/branches/servicemix-4.0/runtime/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/config.properties
Modified: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=598828&r1=598827&r2=598828&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml Tue Nov 27 16:21:27 2007
@@ -1,270 +1,260 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly>
- <id>unix-bin</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <fileSets>
-
- <!-- Copy license and other files from root -->
- <fileSet>
- <directory>..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*.txt</include>
- </includes>
- </fileSet>
-
- <!-- Copy over everything that needs to get unix line endings -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>bin/**</exclude>
- </excludes>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>bin/macosx/wrapper.conf</include>
- <include>bin/linux/wrapper.conf</include>
- <include>bin/win32/wrapper.conf</include>
- <include>bin/win32/*.bat</include>
- </includes>
- <lineEnding>unix</lineEnding>
- </fileSet>
-
- <!-- Copy over files that should not get the line endings converted -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>bin/*.jar</include>
- <include>bin/win32/wrapper.dll</include>
- <include>bin/win32/wrapper.exe</include>
- </includes>
- </fileSet>
-
- <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>bin/linux/wrapper</include>
- <include>bin/linux/libwrapper.so</include>
- <include>bin/macosx/wrapper</include>
- <include>bin/macosx/libwrapper.jnilib</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
-
- <!-- Copy over the files that need unix line endings and also chmod to 755 -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>bin/servicemix.bat</include>
- <include>bin/servicemix.sh</include>
- <include>bin/linux/servicemix.sh</include>
- <include>bin/macosx/servicemix.sh</include>
- <include>bin/win32/servicemix.bat</include>
- </includes>
- <fileMode>0755</fileMode>
- <lineEnding>unix</lineEnding>
- </fileSet>
-
- <!-- Copy over jar files -->
- <fileSet>
- <directory>target/dependencies</directory>
- <outputDirectory>/bin/</outputDirectory>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
-
- <!-- Mandatory bundles for everything -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <!-- Compendium -->
- <include>org.apache.felix:org.osgi.compendium</include>
- <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-
- <!-- PAX Logging -->
- <include>org.ops4j.pax.logging:pax-logging-api</include>
- <include>org.ops4j.pax.logging:pax-logging-service</include>
-
- <!-- PAX config -->
- <include>org.apache.felix:org.apache.felix.configadmin</include>
- <include>org.ops4j.pax.confman:pax-confman-propsloader</include>
-
- <!-- Spring OSGi -->
- <include>org.springframework:spring-aop</include>
- <include>org.springframework:spring-beans</include>
- <include>org.springframework:spring-context</include>
- <include>org.springframework:spring-core</include>
- <include>org.springframework.osgi:spring-osgi-core</include>
- <include>org.springframework.osgi:spring-osgi-extender</include>
- <include>org.springframework.osgi:spring-osgi-io</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
-
- </includes>
- </dependencySet>
-
- <!-- NMR -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
- </includes>
- </dependencySet>
-
- <!-- GShell -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xstream</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
- </includes>
- </dependencySet>
-
- <!-- FileMonitor -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
- </includes>
- </dependencySet>
-
- <!-- Transaction Manager -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
- <include>org.springframework:spring-tx</include>
- <include>org.apache.servicemix:org.apache.servicemix.transaction</include>
- </includes>
- </dependencySet>
-
- <!-- ActiveMQ -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.activemq:activemq-core</include>
- <include>org.apache.servicemix:org.apache.servicemix.activemq</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>org.apache.xbean:xbean-spring</include>
- </includes>
- </dependencySet>
-
- <!-- Management -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
- </includes>
- </dependencySet>
-
- <!-- JBI 1.0 -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
- </includes>
- </dependencySet>
-
- <!-- Camel -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.springframework:spring-jms</include>
- <include>org.apache.camel:camel-core</include>
- <include>org.apache.camel:camel-spring</include>
- <include>org.apache.camel:camel-jms</include>
- </includes>
- </dependencySet>
-
-
- <!-- OpenEJB -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-saaj_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openejb</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j</include>
- <include>org.apache.xbean:xbean-naming</include>
- <include>org.apache.xbean:xbean-finder</include>
- <include>org.apache.xbean:xbean-reflect</include>
- <include>org.ops4j.pax.web:pax-web-service</include>
- <include>org.apache.servicemix.openejb:org.apache.servicemix.openejb</include>
- <include>org.apache.ws.commons.schema:XmlSchema</include>
- </includes>
- </dependencySet>
-
- </dependencySets>
-
-</assembly>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly>
+ <id>unix-bin</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy over everything that needs to get unix line endings -->
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/**</exclude>
+ </excludes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/macosx/wrapper.conf</include>
+ <include>bin/linux/wrapper.conf</include>
+ <include>bin/win32/wrapper.conf</include>
+ <include>bin/win32/*.bat</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <!-- Copy over files that should not get the line endings converted -->
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*.jar</include>
+ <include>bin/win32/wrapper.dll</include>
+ <include>bin/win32/wrapper.exe</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>bin/linux/wrapper</include>
+ <include>bin/linux/libwrapper.so</include>
+ <include>bin/macosx/wrapper</include>
+ <include>bin/macosx/libwrapper.jnilib</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
+ <!-- Copy over the files that need unix line endings and also chmod to 755 -->
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>bin/servicemix.bat</include>
+ <include>bin/servicemix.sh</include>
+ <include>bin/linux/servicemix.sh</include>
+ <include>bin/macosx/servicemix.sh</include>
+ <include>bin/win32/servicemix.bat</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <!-- Copy over jar files -->
+ <fileSet>
+ <directory>target/dependencies</directory>
+ <outputDirectory>/bin/</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+
+ <dependencySets>
+
+ <!-- Mandatory bundles for everything -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <!-- Compendium -->
+ <include>org.apache.felix:org.osgi.compendium</include>
+ <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+
+ <!-- PAX Logging -->
+ <include>org.ops4j.pax.logging:pax-logging-api</include>
+ <include>org.ops4j.pax.logging:pax-logging-service</include>
+
+ <!-- PAX config -->
+ <include>org.apache.felix:org.apache.felix.configadmin</include>
+ <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
+
+ <!-- Spring OSGi -->
+ <include>org.springframework:spring-aop</include>
+ <include>org.springframework:spring-beans</include>
+ <include>org.springframework:spring-context</include>
+ <include>org.springframework:spring-core</include>
+ <include>org.springframework.osgi:spring-osgi-core</include>
+ <include>org.springframework.osgi:spring-osgi-extender</include>
+ <include>org.springframework.osgi:spring-osgi-io</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
+
+ </includes>
+ </dependencySet>
+
+ <!-- NMR -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
+ </includes>
+ </dependencySet>
+
+ <!-- GShell -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xstream</include>
+ <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
+ <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
+ </includes>
+ </dependencySet>
+
+ <!-- Transaction Manager -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+ <include>org.springframework:spring-tx</include>
+ <include>org.apache.servicemix:org.apache.servicemix.transaction</include>
+ </includes>
+ </dependencySet>
+
+ <!-- ActiveMQ -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.servicemix:org.apache.servicemix.activemq</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ <include>org.apache.xbean:xbean-spring</include>
+ </includes>
+ </dependencySet>
+
+ <!-- Management -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
+ </includes>
+ </dependencySet>
+
+ <!-- JBI 1.0 -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
+ </includes>
+ </dependencySet>
+
+ <!-- Camel -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.springframework:spring-jms</include>
+ <include>org.apache.camel:camel-core</include>
+ <include>org.apache.camel:camel-spring</include>
+ <include>org.apache.camel:camel-jms</include>
+ </includes>
+ </dependencySet>
+
+
+ <!-- OpenEJB -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-saaj_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openejb</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j</include>
+ <include>org.apache.xbean:xbean-naming</include>
+ <include>org.apache.xbean:xbean-finder</include>
+ <include>org.apache.xbean:xbean-reflect</include>
+ <include>org.ops4j.pax.web:pax-web-service</include>
+ <include>org.apache.servicemix.openejb:org.apache.servicemix.openejb</include>
+ <include>org.apache.ws.commons.schema:XmlSchema</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+</assembly>
Modified: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml?rev=598828&r1=598827&r2=598828&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml Tue Nov 27 16:21:27 2007
@@ -1,270 +1,260 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly>
- <id>windows-bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
-
- <!-- Copy license and other files from root -->
- <fileSet>
- <directory>..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*.txt</include>
- </includes>
- </fileSet>
-
- <!-- Copy over everything that needs to get unix line endings -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>bin/**</exclude>
- </excludes>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>bin/macosx/wrapper.conf</include>
- <include>bin/linux/wrapper.conf</include>
- <include>bin/win32/wrapper.conf</include>
- <include>bin/win32/*.bat</include>
- <include>bin/*.bat</include>
- </includes>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
- <!-- Copy over files that should not get the line endings converted -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>bin/*.jar</include>
- <include>bin/win32/wrapper.dll</include>
- <include>bin/win32/wrapper.exe</include>
- </includes>
- </fileSet>
-
- <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>bin/linux/wrapper</include>
- <include>bin/linux/libwrapper.so</include>
- <include>bin/macosx/wrapper</include>
- <include>bin/macosx/libwrapper.jnilib</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
-
- <!-- Copy over the files that need unix line endings and also chmod to 755 -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>bin/servicemix.bat</include>
- <include>bin/servicemix.sh</include>
- <include>bin/linux/servicemix.sh</include>
- <include>bin/macosx/servicemix.sh</include>
- <include>bin/win32/servicemix.bat</include>
- </includes>
- <fileMode>0755</fileMode>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
- <!-- Copy over jar files -->
- <fileSet>
- <directory>target/dependencies</directory>
- <outputDirectory>/bin/</outputDirectory>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
-
- <!-- Mandatory bundles for everything -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <!-- Compendium -->
- <include>org.apache.felix:org.osgi.compendium</include>
- <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-
- <!-- PAX Logging -->
- <include>org.ops4j.pax.logging:pax-logging-api</include>
- <include>org.ops4j.pax.logging:pax-logging-service</include>
-
- <!-- PAX config -->
- <include>org.apache.felix:org.apache.felix.configadmin</include>
- <include>org.ops4j.pax.confman:pax-confman-propsloader</include>
-
- <!-- Spring OSGi -->
- <include>org.springframework:spring-aop</include>
- <include>org.springframework:spring-beans</include>
- <include>org.springframework:spring-context</include>
- <include>org.springframework:spring-core</include>
- <include>org.springframework.osgi:spring-osgi-core</include>
- <include>org.springframework.osgi:spring-osgi-extender</include>
- <include>org.springframework.osgi:spring-osgi-io</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
-
- </includes>
- </dependencySet>
-
- <!-- NMR -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
- </includes>
- </dependencySet>
-
- <!-- GShell -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xstream</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
- </includes>
- </dependencySet>
-
- <!-- FileMonitor -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
- </includes>
- </dependencySet>
-
- <!-- Transaction Manager -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
- <include>org.springframework:spring-tx</include>
- <include>org.apache.servicemix:org.apache.servicemix.transaction</include>
- </includes>
- </dependencySet>
-
- <!-- ActiveMQ-->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.activemq:activemq-core</include>
- <include>org.apache.servicemix:org.apache.servicemix.activemq</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>org.apache.xbean:xbean-spring</include>
- </includes>
- </dependencySet>
-
- <!-- Management -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
- </includes>
- </dependencySet>
-
- <!-- JBI 1.0 -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
- </includes>
- </dependencySet>
-
- <!-- OpenEJB -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-saaj_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openejb</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j</include>
- <include>org.apache.xbean:xbean-naming</include>
- <include>org.apache.xbean:xbean-finder</include>
- <include>org.apache.xbean:xbean-reflect</include>
- <include>org.ops4j.pax.web:pax-web-service</include>
- <include>org.apache.servicemix.openejb:org.apache.servicemix.openejb</include>
- <include>org.apache.ws.commons.schema:XmlSchema</include>
- </includes>
- </dependencySet>
-
-
- <!-- Camel -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.camel:camel-core</include>
- <include>org.apache.camel:camel-spring</include>
- <include>org.apache.camel:camel-jms</include>
- </includes>
- </dependencySet>
-
- </dependencySets>
-
-</assembly>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly>
+ <id>windows-bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy over everything that needs to get unix line endings -->
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/**</exclude>
+ </excludes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/macosx/wrapper.conf</include>
+ <include>bin/linux/wrapper.conf</include>
+ <include>bin/win32/wrapper.conf</include>
+ <include>bin/win32/*.bat</include>
+ <include>bin/*.bat</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <!-- Copy over files that should not get the line endings converted -->
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*.jar</include>
+ <include>bin/win32/wrapper.dll</include>
+ <include>bin/win32/wrapper.exe</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>bin/linux/wrapper</include>
+ <include>bin/linux/libwrapper.so</include>
+ <include>bin/macosx/wrapper</include>
+ <include>bin/macosx/libwrapper.jnilib</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
+ <!-- Copy over the files that need unix line endings and also chmod to 755 -->
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>bin/servicemix.bat</include>
+ <include>bin/servicemix.sh</include>
+ <include>bin/linux/servicemix.sh</include>
+ <include>bin/macosx/servicemix.sh</include>
+ <include>bin/win32/servicemix.bat</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <!-- Copy over jar files -->
+ <fileSet>
+ <directory>target/dependencies</directory>
+ <outputDirectory>/bin/</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+
+ <dependencySets>
+
+ <!-- Mandatory bundles for everything -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <!-- Compendium -->
+ <include>org.apache.felix:org.osgi.compendium</include>
+ <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+
+ <!-- PAX Logging -->
+ <include>org.ops4j.pax.logging:pax-logging-api</include>
+ <include>org.ops4j.pax.logging:pax-logging-service</include>
+
+ <!-- PAX config -->
+ <include>org.apache.felix:org.apache.felix.configadmin</include>
+ <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
+
+ <!-- Spring OSGi -->
+ <include>org.springframework:spring-aop</include>
+ <include>org.springframework:spring-beans</include>
+ <include>org.springframework:spring-context</include>
+ <include>org.springframework:spring-core</include>
+ <include>org.springframework.osgi:spring-osgi-core</include>
+ <include>org.springframework.osgi:spring-osgi-extender</include>
+ <include>org.springframework.osgi:spring-osgi-io</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
+
+ </includes>
+ </dependencySet>
+
+ <!-- NMR -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
+ </includes>
+ </dependencySet>
+
+ <!-- GShell -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xstream</include>
+ <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
+ <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
+ </includes>
+ </dependencySet>
+
+ <!-- Transaction Manager -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+ <include>org.springframework:spring-tx</include>
+ <include>org.apache.servicemix:org.apache.servicemix.transaction</include>
+ </includes>
+ </dependencySet>
+
+ <!-- ActiveMQ-->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.servicemix:org.apache.servicemix.activemq</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ <include>org.apache.xbean:xbean-spring</include>
+ </includes>
+ </dependencySet>
+
+ <!-- Management -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
+ </includes>
+ </dependencySet>
+
+ <!-- JBI 1.0 -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
+ </includes>
+ </dependencySet>
+
+ <!-- OpenEJB -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-saaj_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openejb</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j</include>
+ <include>org.apache.xbean:xbean-naming</include>
+ <include>org.apache.xbean:xbean-finder</include>
+ <include>org.apache.xbean:xbean-reflect</include>
+ <include>org.ops4j.pax.web:pax-web-service</include>
+ <include>org.apache.servicemix.openejb:org.apache.servicemix.openejb</include>
+ <include>org.apache.ws.commons.schema:XmlSchema</include>
+ </includes>
+ </dependencySet>
+
+
+ <!-- Camel -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.camel:camel-core</include>
+ <include>org.apache.camel:camel-spring</include>
+ <include>org.apache.camel:camel-jms</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+</assembly>
Modified: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/config.properties
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/config.properties?rev=598828&r1=598827&r2=598828&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/config.properties (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/config.properties Tue Nov 27 16:21:27 2007
@@ -45,6 +45,7 @@
#
# FileMonitor properties
#
+org.apache.servicemix.filemonitor.configDir = ./conf
org.apache.servicemix.filemonitor.monitorDir = ./deploy
org.apache.servicemix.filemonitor.generatedJarDir = ./data/generated-bundles
org.apache.servicemix.filemonitor.scanInterval = 500
Modified: servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml?rev=598828&r1=598827&r2=598828&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml (original)
+++ servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml Tue Nov 27 16:21:27 2007
@@ -52,7 +52,12 @@
</bean>
<!-- Create a JMX connector ServiceFactory -->
- <bean id="jmxConnectorServiceFactory" class="org.apache.servicemix.management.JmxConnectorServiceFactory">
+ <bean id="jmxConnectorService" class="org.springframework.jmx.support.ConnectorServerFactoryBean">
+ <property name="server" ref="mbeanServer" />
+ <property name="serviceUrl" value="${serviceUrl}" />
+ <property name="daemon" value="${daemon}" />
+ <property name="threaded" value="${threaded}" />
+ <property name="objectName" value="${objectName}" />
<property name="environment" ref="jmxConnectorEnvironment" />
</bean>
@@ -66,22 +71,16 @@
another one is exported by a bundle with a higher ranking -->
<osgi:reference id="jmxAuthenticator" interface="javax.management.remote.JMXAuthenticator" cardinality="0..1"/>
- <!-- Export the factory as a managed factory in OSGi -->
- <osgi:service ref="jmxConnectorServiceFactory">
- <osgi:interfaces>
- <value>org.osgi.service.cm.ManagedServiceFactory</value>
- </osgi:interfaces>
- <osgi:service-properties>
- <entry key="service.pid" value="org.apache.servicemix.management.JmxConnectorServiceFactory" />
- </osgi:service-properties>
- </osgi:service>
-
<!-- Property place holder -->
<osgix:property-placeholder persistent-id="org.apache.servicemix.management">
<osgix:default-properties>
<prop key="rmiRegistryPort">1099</prop>
<prop key="jmxLogin">smx</prop>
<prop key="jmxPassword">smx</prop>
+ <prop key="serviceUrl">service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</prop>
+ <prop key="daemon">true</prop>
+ <prop key="threaded">true</prop>
+ <prop key="objectName">connector:name=rmi</prop>
</osgix:default-properties>
</osgix:property-placeholder>
Modified: servicemix/branches/servicemix-4.0/runtime/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java?rev=598828&r1=598827&r2=598828&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java Tue Nov 27 16:21:27 2007
@@ -49,11 +49,13 @@
* @version $Revision: 1.1 $
*/
public class FileMonitor {
+ public final static String CONFIG_DIR = "org.apache.servicemix.filemonitor.configDir";
public final static String DEPLOY_DIR = "org.apache.servicemix.filemonitor.monitorDir";
public final static String GENERATED_JAR_DIR = "org.apache.servicemix.filemonitor.generatedJarDir";
public final static String SCAN_INTERVAL = "org.apache.servicemix.filemonitor.scanInterval";
protected static final String ALIAS_KEY = "_alias_factory_pid";
private FileMonitorActivator activator;
+ private File configDir = new File("./conf");
private File deployDir = new File("./deploy");
private File generateDir = new File("./data/generated-bundles");
private Scanner scanner = new Scanner();
@@ -69,7 +71,11 @@
public FileMonitor(FileMonitorActivator activator, Dictionary properties) {
this.activator = activator;
- File value = getFileValue(properties, DEPLOY_DIR);
+ File value = getFileValue(properties, CONFIG_DIR);
+ if (value != null) {
+ configDir = value;
+ }
+ value = getFileValue(properties, DEPLOY_DIR);
if (value != null) {
deployDir = value;
}
@@ -84,10 +90,16 @@
}
public void start() {
+ if (configDir != null) {
+ configDir.mkdirs();
+ }
deployDir.mkdirs();
generateDir.mkdirs();
List dirs = new ArrayList();
+ if (configDir != null) {
+ dirs.add(configDir);
+ }
dirs.add(deployDir);
scanner.setScanDirs(dirs);
scanner.setScanInterval(scanInterval);
@@ -99,6 +111,9 @@
});
log("Starting to monitor the deploy directory: " + deployDir + " every " + scanInterval + " millis");
+ if (configDir != null) {
+ log("Config directory is at: " + configDir);
+ }
log("Will generate bundles from expanded source directories to: " + generateDir);
scanner.start();
@@ -121,6 +136,14 @@
public void setActivator(FileMonitorActivator activator) {
this.activator = activator;
+ }
+
+ public File getConfigDir() {
+ return configDir;
+ }
+
+ public void setConfigDir(File configDir) {
+ this.configDir = configDir;
}
public File getDeployDir() {
Modified: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml?rev=598828&r1=598827&r2=598828&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml Tue Nov 27 16:21:27 2007
@@ -117,7 +117,8 @@
<!-- PAX config -->
<include>org.apache.felix:org.apache.felix.configadmin</include>
- <include>org.ops4j.pax.confman:pax-confman-propsloader</include>
+ <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
<!-- Spring OSGi -->
<include>org.springframework:spring-aop</include>
@@ -147,17 +148,6 @@
</includes>
</dependencySet>
-->
-
- <!-- FileMonitor -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
- </includes>
- </dependencySet>
</dependencySets>
Modified: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml?rev=598828&r1=598827&r2=598828&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml Tue Nov 27 16:21:27 2007
@@ -117,7 +117,8 @@
<!-- PAX config -->
<include>org.apache.felix:org.apache.felix.configadmin</include>
- <include>org.ops4j.pax.confman:pax-confman-propsloader</include>
+ <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
<!-- Spring OSGi -->
<include>org.springframework:spring-aop</include>
@@ -147,17 +148,6 @@
</includes>
</dependencySet>
-->
-
- <!-- FileMonitor -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
- </includes>
- </dependencySet>
</dependencySets>
Modified: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/config.properties
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/config.properties?rev=598828&r1=598827&r2=598828&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/config.properties (original)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/config.properties Tue Nov 27 16:21:27 2007
@@ -45,6 +45,7 @@
#
# FileMonitor properties
#
+org.apache.servicemix.filemonitor.configDir = ./conf
org.apache.servicemix.filemonitor.monitorDir = ./deploy
org.apache.servicemix.filemonitor.generatedJarDir = ./data/generated-bundles
org.apache.servicemix.filemonitor.scanInterval = 500
Added: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/org.apache.servicemix.management.cfg
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/org.apache.servicemix.management.cfg?rev=598828&view=auto
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/org.apache.servicemix.management.cfg (added)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/conf/org.apache.servicemix.management.cfg Tue Nov 27 16:21:27 2007
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+rmiRegistryPort = 1099
+jmxLogin = smx
+jmxPassword = smx
+serviceUrl = service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi
+daemon = true
+threaded = true
+objectName = connector:name=rmi