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/09/17 11:59:55 UTC
svn commit: r576332 [1/2] - in
/incubator/servicemix/branches/servicemix-4.0: ./ apache-servicemix/
apache-servicemix/src/ apache-servicemix/src/main/
apache-servicemix/src/main/installers/
apache-servicemix/src/main/installers/bundle/ api/ api/src/mai...
Author: gnodet
Date: Mon Sep 17 02:59:33 2007
New Revision: 576332
URL: http://svn.apache.org/viewvc?rev=576332&view=rev
Log:
Add integration tests and a distribution
Added:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bootstrapper.properties
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bundle/
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bundle/telnetd.jar (with props)
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-mac.xml
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-unix.xml
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-windows.xml
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.properties
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.bat
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh (with props)
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/unix_shortcuts.xml
incubator/servicemix/branches/servicemix-4.0/bundles/
incubator/servicemix/branches/servicemix-4.0/bundles/aopalliance/
incubator/servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml
incubator/servicemix/branches/servicemix-4.0/bundles/commons-logging/
incubator/servicemix/branches/servicemix-4.0/bundles/commons-logging/pom.xml
incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml
incubator/servicemix/branches/servicemix-4.0/bundles/servlet/
incubator/servicemix/branches/servicemix-4.0/bundles/servlet/pom.xml
incubator/servicemix/branches/servicemix-4.0/daemon/
incubator/servicemix/branches/servicemix-4.0/daemon/pom.xml
incubator/servicemix/branches/servicemix-4.0/daemon/src/
incubator/servicemix/branches/servicemix-4.0/daemon/src/main/
incubator/servicemix/branches/servicemix-4.0/daemon/src/main/java/
incubator/servicemix/branches/servicemix-4.0/daemon/src/main/java/org/
incubator/servicemix/branches/servicemix-4.0/daemon/src/main/java/org/apache/
incubator/servicemix/branches/servicemix-4.0/daemon/src/main/java/org/apache/felix/
incubator/servicemix/branches/servicemix-4.0/daemon/src/main/java/org/apache/felix/daemon/
incubator/servicemix/branches/servicemix-4.0/daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java (with props)
incubator/servicemix/branches/servicemix-4.0/daemon/src/main/java/org/apache/felix/daemon/Service.java (with props)
incubator/servicemix/branches/servicemix-4.0/daemon/src/main/resources/
incubator/servicemix/branches/servicemix-4.0/itests/
incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
incubator/servicemix/branches/servicemix-4.0/itests/src/
incubator/servicemix/branches/servicemix-4.0/itests/src/main/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/log4j.properties
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
incubator/servicemix/branches/servicemix-4.0/nmr/
incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml
incubator/servicemix/branches/servicemix-4.0/nmr/src/
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
incubator/servicemix/branches/servicemix-4.0/spring/
incubator/servicemix/branches/servicemix-4.0/spring/pom.xml
incubator/servicemix/branches/servicemix-4.0/spring/src/
incubator/servicemix/branches/servicemix-4.0/spring/src/main/
incubator/servicemix/branches/servicemix-4.0/spring/src/main/java/
incubator/servicemix/branches/servicemix-4.0/spring/src/main/java/org/
incubator/servicemix/branches/servicemix-4.0/spring/src/main/java/org/apache/
incubator/servicemix/branches/servicemix-4.0/spring/src/main/java/org/apache/servicemix/
incubator/servicemix/branches/servicemix-4.0/spring/src/main/java/org/apache/servicemix/spring/
incubator/servicemix/branches/servicemix-4.0/spring/src/main/java/org/apache/servicemix/spring/BundleExtUrlPostProcessor.java
incubator/servicemix/branches/servicemix-4.0/spring/src/main/java/org/apache/servicemix/spring/ReferenceFactory.java
incubator/servicemix/branches/servicemix-4.0/spring/src/test/
incubator/servicemix/branches/servicemix-4.0/spring/src/test/java/
incubator/servicemix/branches/servicemix-4.0/spring/src/test/java/org/
incubator/servicemix/branches/servicemix-4.0/spring/src/test/java/org/apache/
incubator/servicemix/branches/servicemix-4.0/spring/src/test/java/org/apache/servicemix/
incubator/servicemix/branches/servicemix-4.0/spring/src/test/java/org/apache/servicemix/spring/
incubator/servicemix/branches/servicemix-4.0/spring/src/test/java/org/apache/servicemix/spring/BundleExtTest.java
incubator/servicemix/branches/servicemix-4.0/spring/src/test/resources/
incubator/servicemix/branches/servicemix-4.0/spring/src/test/resources/bundle.xml
Modified:
incubator/servicemix/branches/servicemix-4.0/api/pom.xml
incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Endpoint.java
incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/EndpointRegistry.java
incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java
incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Reference.java
incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/event/ListenerRegistry.java
incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/internal/Flow.java
incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/service/ServiceRegistry.java
incubator/servicemix/branches/servicemix-4.0/api/src/test/java/org/apache/servicemix/api/OsgiExample.java
incubator/servicemix/branches/servicemix-4.0/core/pom.xml
incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/EndpointRegistryImpl.java
incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/ServiceMix.java
incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/ServiceRegistryImpl.java
incubator/servicemix/branches/servicemix-4.0/core/src/test/java/org/apache/servicemix/core/IntegrationTest.java
incubator/servicemix/branches/servicemix-4.0/pom.xml
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bootstrapper.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bootstrapper.properties?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bootstrapper.properties (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bootstrapper.properties Mon Sep 17 02:59:33 2007
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+################################################################################
+
+bootstrap.start.class=org.apache.felix.daemon.Service
+bootstrap.stop.class=org.apache.felix.daemon.Service
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bundle/telnetd.jar
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bundle/telnetd.jar?rev=576332&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/bundle/telnetd.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties Mon Sep 17 02:59:33 2007
@@ -0,0 +1,349 @@
+#
+# 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.
+#
+################################################################################
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
+ org.osgi.service.packageadmin; version=1.2.0, \
+ org.osgi.service.startlevel; version=1.0.0, \
+ org.osgi.service.url; version=1.0.0, \
+ ${jre-${java.specification.version}}
+#org.osgi.framework.bootdelegation=sun.*,com.sun.*
+felix.auto.start.1= \
+ "file:${servicemix.home}/bundle/org.apache.felix.shell-1.0.0.jar" \
+ "file:${servicemix.home}/bundle/org.apache.felix.shell.tui-1.0.0.jar" \
+ "file:${servicemix.home}/bundle/org.apache.felix.bundlerepository-1.0.0.jar" \
+ "file:${servicemix.home}/bundle/telnetd.jar" \
+ "file:${servicemix.home}/bundle/org.springframework.spring-osgi-extender-1.0-m3-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.springframework.spring-osgi-core-1.0-m3-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.springframework.spring-osgi-io-1.0-m3-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.springframework.spring-context-2.1-m4.jar" \
+ "file:${servicemix.home}/bundle/org.springframework.spring-beans-2.1-m4.jar" \
+ "file:${servicemix.home}/bundle/org.springframework.spring-core-2.1-m4.jar" \
+ "file:${servicemix.home}/bundle/org.springframework.spring-aop-2.1-m4.jar" \
+ "file:${servicemix.home}/bundle/org.apache.servicemix.nmr-4.0-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.apache.servicemix.spring-4.0-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.apache.servicemix.core-4.0-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.apache.servicemix.api-4.0-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.apache.servicemix.bundles.servlet-2.5-4.0-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.apache.servicemix.bundles.commons-logging-1.1-4.0-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.apache.servicemix.bundles.aopalliance-1.0-4.0-SNAPSHOT.jar"
+felix.startlevel.framework=1
+felix.startlevel.bundle=1
+felix.cache.profiledir=${servicemix.home}/var/cache
+#framework.service.urlhandlers=false
+
+#
+# Bundle config properties.
+#
+org.osgi.service.http.port=8080
+osgi.shell.telnet=on
+#osgi.repository.url=file:/home/rickhall/projects/apache/repository.xml
+
+#
+# Java platform package export properties.
+#
+jre-1.3= \
+ javax.accessibility; \
+ javax.accessibility.resources; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.basic.resources; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.metal.resources; \
+ javax.swing.plaf.multi; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ version="1.3.0"
+
+jre-1.4= \
+ javax.accessibility; \
+ javax.imageio; \
+ javax.imageio.event; \
+ javax.imageio.metadata; \
+ javax.imageio.plugins.jpeg; \
+ javax.imageio.spi; \
+ javax.imageio.stream; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.print; \
+ javax.print.attribute; \
+ javax.print.attribute.standard; \
+ javax.print.event; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.security.auth; \
+ javax.security.auth.callback; \
+ javax.security.auth.kerberos; \
+ javax.security.auth.login; \
+ javax.security.auth.spi; \
+ javax.security.auth.x500; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.sql; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.xml.parsers; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stream; \
+ org.apache.crimson.jaxp; \
+ org.apache.crimson.parser; \
+ org.apache.crimson.parser.resources; \
+ org.apache.crimson.tree; \
+ org.apache.crimson.tree.resources; \
+ org.apache.crimson.util; \
+ org.apache.xalan; \
+ org.apache.xalan.client; \
+ org.apache.xalan.extensions; \
+ org.apache.xalan.lib; \
+ org.apache.xalan.lib.sql; \
+ org.apache.xalan.processor; \
+ org.apache.xalan.res; \
+ org.apache.xalan.serialize; \
+ org.apache.xalan.templates; \
+ org.apache.xalan.trace; \
+ org.apache.xalan.transformer; \
+ org.apache.xalan.xslt; \
+ org.apache.xml.dtm; \
+ org.apache.xml.dtm.ref; \
+ org.apache.xml.dtm.ref.dom2dtm; \
+ org.apache.xml.dtm.ref.sax2dtm; \
+ org.apache.xml.utils; \
+ org.apache.xml.utils.res; \
+ org.apache.xml.utils.synthetic; \
+ org.apache.xml.utils.synthetic.reflection; \
+ org.apache.xpath; \
+ org.apache.xpath.axes; \
+ org.apache.xpath.compiler; \
+ org.apache.xpath.functions; \
+ org.apache.xpath.objects; \
+ org.apache.xpath.operations; \
+ org.apache.xpath.patterns; \
+ org.apache.xpath.res; \
+ org.ietf.jgss; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextExtPackage; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.Dynamic; \
+ org.omg.DynamicAny; \
+ org.omg.DynamicAny.DynAnyFactoryPackage; \
+ org.omg.DynamicAny.DynAnyPackage; \
+ org.omg.IOP; \
+ org.omg.IOP.CodecFactoryPackage; \
+ org.omg.IOP.CodecPackage; \
+ org.omg.Messaging; \
+ org.omg.PortableInterceptor; \
+ org.omg.PortableInterceptor.ORBInitInfoPackage; \
+ org.omg.PortableServer; \
+ org.omg.PortableServer.CurrentPackage; \
+ org.omg.PortableServer.POAManagerPackage; \
+ org.omg.PortableServer.POAPackage; \
+ org.omg.PortableServer.portable; \
+ org.omg.PortableServer.ServantLocatorPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ org.w3c.dom; \
+ org.w3c.dom.css; \
+ org.w3c.dom.events; \
+ org.w3c.dom.html; \
+ org.w3c.dom.stylesheets; \
+ org.w3c.dom.traversal; \
+ org.w3c.dom.views; \
+ org.xml.sax; \
+ org.xml.sax.ext; \
+ org.xml.sax.helpers; \
+ version="1.4.0"
+
+jre-1.5= \
+ javax.accessibility; \
+ javax.activity; \
+ javax.imageio; \
+ javax.imageio.event; \
+ javax.imageio.metadata; \
+ javax.imageio.plugins.bmp; \
+ javax.imageio.plugins.jpeg; \
+ javax.imageio.spi; \
+ javax.imageio.stream; \
+ javax.management; \
+ javax.management.loading; \
+ javax.management.modelmbean; \
+ javax.management.monitor; \
+ javax.management.openmbean; \
+ javax.management.relation; \
+ javax.management.remote; \
+ javax.management.remote.rmi; \
+ javax.management.timer; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.print; \
+ javax.print.attribute; \
+ javax.print.attribute.standard; \
+ javax.print.event; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.rmi.ssl; \
+ javax.security.auth; \
+ javax.security.auth.callback; \
+ javax.security.auth.kerberos; \
+ javax.security.auth.login; \
+ javax.security.auth.spi; \
+ javax.security.auth.x500; \
+ javax.security.sasl; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.sql; \
+ javax.sql.rowset; \
+ javax.sql.rowset.serial; \
+ javax.sql.rowset.spi; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.plaf.synth; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.xml; \
+ javax.xml.datatype; \
+ javax.xml.namespace; \
+ javax.xml.parsers; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stream; \
+ javax.xml.validation; \
+ javax.xml.xpath; \
+ org.ietf.jgss; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextExtPackage; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.Dynamic; \
+ org.omg.DynamicAny; \
+ org.omg.DynamicAny.DynAnyFactoryPackage; \
+ org.omg.DynamicAny.DynAnyPackage; \
+ org.omg.IOP; \
+ org.omg.IOP.CodecFactoryPackage; \
+ org.omg.IOP.CodecPackage; \
+ org.omg.Messaging; \
+ org.omg.PortableInterceptor; \
+ org.omg.PortableInterceptor.ORBInitInfoPackage; \
+ org.omg.PortableServer; \
+ org.omg.PortableServer.CurrentPackage; \
+ org.omg.PortableServer.POAManagerPackage; \
+ org.omg.PortableServer.POAPackage; \
+ org.omg.PortableServer.portable; \
+ org.omg.PortableServer.ServantLocatorPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ org.omg.stub.javax.management.remote.rmi; \
+ org.w3c.dom; \
+ org.w3c.dom.bootstrap; \
+ org.w3c.dom.css; \
+ org.w3c.dom.events; \
+ org.w3c.dom.html; \
+ org.w3c.dom.ls; \
+ org.w3c.dom.ranges; \
+ org.w3c.dom.stylesheets; \
+ org.w3c.dom.traversal; \
+ org.w3c.dom.views; \
+ org.xml.sax; \
+ org.xml.sax.ext; \
+ org.xml.sax.helpers; \
+ version="1.5.0"
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/inno-servicemix.iss Mon Sep 17 02:59:33 2007
@@ -0,0 +1,102 @@
+;
+; 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.
+;
+
+; Project supplied Inno Setup File
+
+#define MyAppName "${app}"
+#define MyAppVerName "${app} ${app.version}"
+#define MyAppVersion "${app.version}"
+#define MyAppPublisher "${app.author}"
+#define MyAppURL "${app.url}"
+#define MyAppExeName "${app}w.exe"
+#define MyAppCompanyName "${app.company.name}"
+#define MyAppDescription "${app.description}"
+#define MyAppCopyright "Copyright (c) ${app.copyright.year} ${app.company.name}"
+
+; Set this constant to the path where your installation image resides
+#define SourceBase "${image.basedir}"
+
+[Setup]
+AppName={#MyAppName}
+AppVerName={#MyAppVerName}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\${app}-${app.version}
+DefaultGroupName={#MyAppName}
+LicenseFile={#SourceBase}\${app.license.name}
+OutputDir="${installer.output.directory}"
+OutputBaseFilename=${app.final.name}
+SetupIconFile={#SourceBase}\${app.icon.name}
+Compression=lzma
+SolidCompression=true
+VersionInfoCompany={#MyAppCompanyName}
+VersionInfoDescription={#MyAppDescription}
+AppCopyright={#MyAppCopyright}
+ShowLanguageDialog=yes
+AppVersion={#MyAppVersion}
+
+[Languages]
+Name: eng; MessagesFile: compiler:Default.isl
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+
+[Files]
+; bin directory targets
+Source: {#SourceBase}\bin\${app}w.exe; DestDir: {app}\bin; Tasks: ; Languages:
+Source: {#SourceBase}\bin\${app}.exe; DestDir: {app}\bin
+Source: {#SourceBase}\bin\${app}.sh; DestDir: {app}\bin
+Source: {#SourceBase}\bin\${app}.bat; DestDir: {app}\bin
+Source: {#SourceBase}\bin\bootstrapper.jar; DestDir: {app}\bin; DestName: bootstrapper.jar
+Source: {#SourceBase}\bin\servicemix.jar; DestDir: {app}\bin; DestName: servicemix.jar
+Source: {#SourceBase}\bin\logger.jar; DestDir: {app}\bin; DestName: logger.jar
+Source: {#SourceBase}\bin\daemon.jar; DestDir: {app}\bin; DestName: daemon.jar
+; bundle directory targets
+Source: {#SourceBase}\bundle\*; DestDir: {app}\bundle; Flags: ignoreversion recursesubdirs createallsubdirs
+; conf directory targets
+Source: {#SourceBase}\conf\log4j.properties; DestDir: {app}\conf; DestName: log4j.properties
+Source: {#SourceBase}\conf\bootstrapper.properties; DestDir: {app}\conf; DestName: bootstrapper.properties
+Source: {#SourceBase}\conf\config.properties; DestDir: {app}\conf; DestName: config.properties
+; top level directory targets
+Source: {#SourceBase}\${app.license.name}; DestDir: {app}; DestName: ${app.license.name}
+Source: {#SourceBase}\${app.readme.name}; DestDir: {app}; DestName: ${app.readme.name}
+Source: {#SourceBase}\${app.icon.name}; DestDir: {app}; DestName: ${app.icon.name}
+; empty var & lib\ext directory structure
+Source: {#SourceBase}\var\*; DestDir: "{app}\var\"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: {#SourceBase}\lib\ext; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs
+; lib directory targets
+${app.lib.jars}
+${docs.directive}
+${sources.directive}
+${notice.file}
+
+[Icons]
+Name: {group}\Service Settings; Filename: {app}\bin\${app}w.exe; Parameters: //ES//${app}; IconIndex: 0
+Name: {userdesktop}\{#MyAppName}; Filename: {app}\bin\${app}w.exe; Tasks: desktopicon; Parameters: //ES//${app}; IconIndex: 0; Languages:
+Name: {group}\Tray Monitor; Filename: {app}\bin\${app}w.exe; Parameters: //MS//${app}; IconIndex: 0
+Name: {group}\Test Service; Filename: {app}\bin\${app}.exe; IconIndex: 0
+
+[Run]
+Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Tasks: ; Languages: ; Parameters: "//IS//${app.displayname} --Description=""${app.description} Service ${app.version} - ${app.url}"" --DisplayName=${app.displayname} --Install=""{app}\bin\${app}.exe"" --StartMode=jvm --StopMode=jvm --StartClass=org.apache.directory.daemon.ProcrunBootstrapper --StartMethod prunsrvStart --StartParams=""{app}"" --StopClass=org.apache.directory.daemon.ProcrunBootstrapper --StopMethod prunsrvStop --StopParams=""{app}"" --Startup=manual --JvmOptions=""-D${app}.home={app}"" --Classpath=""{app}\bin\bootstrapper.jar;{app}\conf;{app}\bin\logger.jar;{app}\bin\daemon.jar"" --LogPath=""{app}\var\log"" --LogPrefix=${app}.log --LogLevel=debug --StdOutput=""{app}\var\log\${app}-stdout.log"" --StdError=""{app}\var\log\${app}-stderr.log"""; Flags: runhidden
+Filename: {app}\bin\${app}w.exe; Parameters: //ES//${app.displayname}; WorkingDir: {app}\bin; Flags: postinstall nowait; Description: Runs the configuration manager for the ${app} windows service
+
+[Registry]
+
+[UninstallRun]
+Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Parameters: //DS//${app.displayname}
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-mac.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-mac.xml?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-mac.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-mac.xml Mon Sep 17 02:59:33 2007
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+
+ 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.
+-->
+
+<installation version="1.0">
+ <info>
+ <appname>${app}</appname>
+ <appversion>${app.version}</appversion>
+ <appsubpath>${app}-${app.version}</appsubpath>
+ <authors>
+ <author name="${app.author}" email="${app.email}" />
+ </authors>
+ <url>${app.url}</url>
+ <javaversion>${app.java.version}</javaversion>
+ </info>
+
+ <guiprefs height="480" resizable="yes" width="640">
+ <laf name="metouia">
+ <os family="unix" />
+ </laf>
+ </guiprefs>
+
+ <locale>
+ <langpack iso3="eng" />
+ </locale>
+
+ <resources>
+ <res id="installer.langsel.img" src="${app.icon}" />
+ <res id="Installer.image" src="${app.icon}" />
+ <res id="Installer.image.0" src="${app.icon}" />
+ <res id="Installer.image.1" src="${app.icon}" />
+ <res id="Installer.image.2" src="${app.icon}" />
+ <res id="Installer.image.3" src="${app.icon}" />
+ <res id="Installer.image.4" src="${app.icon}" />
+ <res id="Installer.image.5" src="${app.icon}" />
+ <res id="LicencePanel.licence" src="${app.license}" />
+ <res id="InfoPanel.info" src="${app.readme}" />
+ <res id="ImgPacksPanel.img.0" src="${app.icon}" />
+ <res id="ImgPacksPanel.img.1" src="${app.icon}" />
+ <res id="shortcutSpec.xml" src="${unix.shortcuts}" />
+ <res id="Unix_shortcutSpec.xml" src="${unix.shortcuts}" />
+ <res id="userInputSpec.xml" src="${user.input}" />
+ </resources>
+
+ <panels>
+ <panel classname="HelloPanel" />
+ <panel classname="InfoPanel" />
+ <panel classname="LicencePanel" />
+ <panel classname="TargetPanel" />
+ <panel classname="ImgPacksPanel" />
+ <panel classname="InstallPanel" />
+ <panel classname="ShortcutPanel" />
+ <panel classname="FinishPanel" />
+ </panels>
+
+ <packs>
+ <pack name="Binaries" required="yes">
+ <description>Binary Executables</description>
+ <fileset dir="${image.basedir}" targetdir="$INSTALL_PATH">
+ <include name="**/*" />
+ </fileset>
+
+ <executable os="unix" targetfile="$INSTALL_PATH/bin/${app}" stage="never" keep="true" />
+ <parsable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" type="shell" />
+ <executable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" stage="never" keep="true" />
+ <parsable os="unix" targetfile="$INSTALL_PATH/bin/servicemix.sh" type="shell" />
+ <executable os="unix" targetfile="$INSTALL_PATH/bin/servicemix.sh" stage="never" keep="true" />
+ </pack>
+ </packs>
+</installation>
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-unix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-unix.xml?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-unix.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-unix.xml Mon Sep 17 02:59:33 2007
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+
+ 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.
+-->
+
+<installation version="1.0">
+ <info>
+ <appname>${app}</appname>
+ <appversion>${app.version}</appversion>
+ <appsubpath>${app}-${app.version}</appsubpath>
+ <authors>
+ <author name="${app.author}" email="${app.email}" />
+ </authors>
+ <url>${app.url}</url>
+ <javaversion>${app.java.version}</javaversion>
+ </info>
+
+ <guiprefs height="480" resizable="yes" width="640">
+ <laf name="metouia">
+ <os family="unix" />
+ </laf>
+ </guiprefs>
+
+ <locale>
+ <langpack iso3="eng" />
+ </locale>
+
+ <resources>
+ <res id="installer.langsel.img" src="${app.icon}" />
+ <res id="Installer.image" src="${app.icon}" />
+ <res id="Installer.image.0" src="${app.icon}" />
+ <res id="Installer.image.1" src="${app.icon}" />
+ <res id="Installer.image.2" src="${app.icon}" />
+ <res id="Installer.image.3" src="${app.icon}" />
+ <res id="Installer.image.4" src="${app.icon}" />
+ <res id="Installer.image.5" src="${app.icon}" />
+ <res id="LicencePanel.licence" src="${app.license}" />
+ <res id="InfoPanel.info" src="${app.readme}" />
+ <res id="ImgPacksPanel.img.0" src="${app.icon}" />
+ <res id="ImgPacksPanel.img.1" src="${app.icon}" />
+ <res id="shortcutSpec.xml" src="${unix.shortcuts}" />
+ <res id="Unix_shortcutSpec.xml" src="${unix.shortcuts}" />
+ <res id="userInputSpec.xml" src="${user.input}" />
+ </resources>
+
+ <panels>
+ <panel classname="HelloPanel" />
+ <panel classname="InfoPanel" />
+ <panel classname="LicencePanel" />
+ <panel classname="TargetPanel" />
+ <panel classname="ImgPacksPanel" />
+ <panel classname="InstallPanel" />
+ <panel classname="ShortcutPanel" />
+ <panel classname="FinishPanel" />
+ </panels>
+
+ <packs>
+ <pack name="Binaries" required="yes">
+ <description>Binary Executables</description>
+ <fileset dir="${image.basedir}" targetdir="$INSTALL_PATH">
+ <include name="**/*" />
+ </fileset>
+
+ <executable os="unix" targetfile="$INSTALL_PATH/bin/${app}" stage="never" keep="true" />
+ <parsable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" type="shell" />
+ <parsable os="unix" targetfile="$INSTALL_PATH/conf/config.properties" type="shell" />
+ <executable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" stage="never" keep="true" />
+ <executable os="unix" targetfile="$INSTALL_PATH/bin/felix.jar" stage="never" keep="true" />
+ </pack>
+ </packs>
+</installation>
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-windows.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-windows.xml?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-windows.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/izpack-windows.xml Mon Sep 17 02:59:33 2007
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+
+ 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.
+-->
+
+<installation version="1.0">
+ <info>
+ <appname>${app}</appname>
+ <appversion>${app.version}</appversion>
+ <appsubpath>${app}-${app.version}</appsubpath>
+ <authors>
+ <author name="${app.author}" email="${app.email}" />
+ </authors>
+ <url>${app.url}</url>
+ <javaversion>${app.java.version}</javaversion>
+ </info>
+
+ <guiprefs height="480" resizable="yes" width="640">
+ <laf name="looks">
+ <os family="windows" />
+ <param name="variant" value="extwin" />
+ </laf>
+ </guiprefs>
+
+ <locale>
+ <langpack iso3="eng" />
+ </locale>
+
+ <resources>
+ <res id="installer.langsel.img" src="${app.icon}" />
+ <res id="Installer.image" src="${app.icon}" />
+ <res id="Installer.image.0" src="${app.icon}" />
+ <res id="Installer.image.1" src="${app.icon}" />
+ <res id="Installer.image.2" src="${app.icon}" />
+ <res id="Installer.image.3" src="${app.icon}" />
+ <res id="Installer.image.4" src="${app.icon}" />
+ <res id="Installer.image.5" src="${app.icon}" />
+
+ <res id="LicencePanel.licence" src="${app.license}" />
+ <res id="InfoPanel.info" src="${app.readme}" />
+
+ <res id="ImgPacksPanel.img.0" src="${app.icon}" />
+ <res id="ImgPacksPanel.img.1" src="${app.icon}" />
+ <res id="Win_shortcutSpec.xml" src="${windows.shortcuts}" />
+ <res id="userInputSpec.xml" src="${user.input}" />
+ </resources>
+
+ <native type="izpack" name="ShellLink.dll" />
+
+ <panels>
+ <panel classname="HelloPanel" />
+ <panel classname="InfoPanel" />
+ <panel classname="LicencePanel" />
+ <panel classname="TargetPanel" />
+ <panel classname="ImgPacksPanel" />
+ <panel classname="InstallPanel" />
+ <panel classname="ShortcutPanel" />
+ <panel classname="FinishPanel" />
+ </panels>
+
+ <!--
+ The packs section. We specify here our packs.
+ -->
+ <packs>
+ <pack name="Binaries" required="yes">
+ <description>Binary executables</description>
+ <fileset dir="${image.basedir}" targetdir="$INSTALL_PATH">
+ <include name="**/*" />
+ </fileset>
+ </pack>
+ </packs>
+</installation>
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.properties?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.properties (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/log4j.properties Mon Sep 17 02:59:33 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.
+#
+################################################################################
+
+log4j.rootCategory=WARN, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
+
+# with these we'll not get innundated when switching to DEBUG
+
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/rpm-servicemix.spec Mon Sep 17 02:59:33 2007
@@ -0,0 +1,102 @@
+##
+## 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.
+##
+Summary: ${app.display.name} Server
+Name: ${app}
+Version: ${app.version}
+Release: ${app.release}
+License: ${app.license.type}
+Group: System Environment/Daemons
+URL: ${app.url}
+Source0: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+${app.description}
+
+%prep
+echo $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT
+cp -rf ${image.basedir} $RPM_BUILD_ROOT/%{name}-%{version}
+cd $RPM_BUILD_ROOT
+tar -zcvf /usr/src/redhat/SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}
+
+%setup -q
+
+%build
+cd $RPM_BUILD_ROOT/%{name}-%{version}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin
+mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf
+mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/lib/ext
+mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/log
+mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/run
+mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/partitions
+touch $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/log/${app}-stderr.log
+touch $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/log/${app}-stdout.log
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+${mk.docs.dirs}
+${mk.sources.dirs}
+
+pwd
+install -m 755 ${image.basedir}/bin/${app} $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/${app}
+install -m 644 ${image.basedir}/bin/bootstrapper.jar $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/bootstrapper.jar
+install -m 644 ${image.basedir}/bin/logger.jar $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/logger.jar
+install -m 644 ${image.basedir}/bin/daemon.jar $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/daemon.jar
+install -m 644 ${image.basedir}/conf/bootstrapper.properties $RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf/bootstrapper.properties
+install -m 644 ${image.basedir}/conf/log4j.properties $RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf/log4j.properties
+install -m 744 ${image.basedir}/bin/${server.init} $RPM_BUILD_ROOT/etc/init.d/${app}
+install -m 744 ${image.basedir}/bin/servicemix.jar $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/servicemix.jar
+install -m 644 ${image.basedir}/${app.license.name} $RPM_BUILD_ROOT/usr/local/${app}-%{version}
+install -m 644 ${image.basedir}/${app.readme.name} $RPM_BUILD_ROOT/usr/local/${app}-%{version}
+install -m 644 ${image.basedir}/${app.icon} $RPM_BUILD_ROOT/usr/local/${app}-%{version}
+${install.append.libs}
+${install.docs}
+${install.sources}
+${install.notice.file}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc ${app.license.name} ${app.readme.name}
+
+/etc/init.d/${app}
+/usr/local/${app}-%{version}/bin/${app}
+/usr/local/${app}-%{version}/bin/bootstrapper.jar
+/usr/local/${app}-%{version}/bin/logger.jar
+/usr/local/${app}-%{version}/bin/daemon.jar
+/usr/local/${app}-%{version}/bin/servicemix.jar
+/usr/local/${app}-%{version}/conf/log4j.properties
+/usr/local/${app}-%{version}/conf/bootstrapper.properties
+/usr/local/${app}-%{version}/conf/server.xml
+/usr/local/${app}-%{version}/lib/ext
+/usr/local/${app}-%{version}/var/run
+/usr/local/${app}-%{version}/var/log
+/usr/local/${app}-%{version}/var/partitions
+/usr/local/${app}-%{version}/var/log/${app}-stderr.log
+/usr/local/${app}-%{version}/var/log/${app}-stdout.log
+/usr/local/${app}-%{version}/${app.readme.name}
+/usr/local/${app}-%{version}/${app.license.name}
+/usr/local/${app}-%{version}/${app.icon}
+${verify.append.libs}
+${verify.docs}
+${verify.sources}
+${verify.notice.file}
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.bat
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.bat?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.bat (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.bat Mon Sep 17 02:59:33 2007
@@ -0,0 +1,128 @@
+@echo off
+rem
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+rem
+rem $Id: servicemix.bat 979 2005-11-30 22:50:55Z bsnyder $
+rem
+
+if not "%ECHO%" == "" echo %ECHO%
+
+setlocal
+set DIRNAME=%~dp0%
+set PROGNAME=%~nx0%
+set ARGS=%*
+
+title ServiceMix
+
+goto BEGIN
+
+:warn
+ echo %PROGNAME%: %*
+goto :EOF
+
+:BEGIN
+
+rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+if not "%SERVICEMIX_HOME%" == "" (
+ call :warn Ignoring predefined value for SERVICEMIX_HOME
+)
+set SERVICEMIX_HOME=%DIRNAME%..
+if not exist "%SERVICEMIX_HOME%" (
+ call :warn SERVICEMIX_HOME is not valid: %SERVICEMIX_HOME%
+ goto END
+)
+
+set LOCAL_CLASSPATH=%CLASSPATH%
+set DEFAULT_JAVA_OPTS=-server -Xmx512M -Dderby.system.home="%SERVICEMIX_HOME%\var" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote
+set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_HOME%\conf
+set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+
+if "%LOCAL_CLASSPATH%" == "" goto :SERVICEMIX_CLASSPATH_EMPTY
+ set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_HOME%\conf
+ goto :SERVICEMIX_CLASSPATH_END
+:SERVICEMIX_CLASSPATH_EMPTY
+ set CLASSPATH=%SERVICEMIX_HOME%\conf
+:SERVICEMIX_CLASSPATH_END
+
+rem Setup Servicemix Home
+if exist "%SERVICEMIX_HOME%\conf\servicemix-rc.cmd" call %SERVICEMIX_HOME%\conf\servicemix-rc.cmd
+if exist "%HOME%\servicemix-rc.cmd" call %HOME%\servicemix-rc.cmd
+
+rem Support for loading native libraries
+set PATH=%PATH%;%SERVICEMIX_HOME%\lib
+
+rem Setup the Java Virtual Machine
+if not "%JAVA%" == "" goto :Check_JAVA_END
+ set JAVA=java
+ if "%JAVA_HOME%" == "" call :warn JAVA_HOME not set; results may vary
+ if not "%JAVA_HOME%" == "" set JAVA=%JAVA_HOME%\bin\java
+ if not exist "%JAVA_HOME%" (
+ call :warn JAVA_HOME is not valid: %JAVA_HOME%
+ goto END
+ )
+:Check_JAVA_END
+
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
+
+if "%SERVICEMIX_DEBUG%" == "" goto :SERVICEMIX_DEBUG_END
+ rem Use the defaults if JAVA_DEBUG_OPTS was not set
+ if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS%
+
+ set "JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%"
+ call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
+:SERVICEMIX_DEBUG_END
+
+if "%SERVICEMIX_PROFILER%" == "" goto :SERVICEMIX_PROFILER_END
+ set SERVICEMIX_PROFILER_SCRIPT=%SERVICEMIX_HOME%\conf\profiler\%SERVICEMIX_PROFILER%.cmd
+
+ if exist "%SERVICEMIX_PROFILER_SCRIPT%" goto :SERVICEMIX_PROFILER_END
+ call :warn Missing configuration for profiler '%SERVICEMIX_PROFILER%': %SERVICEMIX_PROFILER_SCRIPT%
+ goto END
+:SERVICEMIX_PROFILER_END
+
+rem Setup the classpath
+set CLASSPATH=%CLASSPATH%;%SERVICEMIX_HOME%\lib\classworlds-1.0.1.jar
+
+rem Setup boot options
+set CLASSWORLDS_CONF=%SERVICEMIX_HOME%\conf\servicemix.conf
+set BOOT_OPTS=%BOOT_OPTS% -Dclassworlds.conf="%CLASSWORLDS_CONF%"
+set BOOT_OPTS=%BOOT_OPTS% -Dservicemix.home="%SERVICEMIX_HOME%"
+set BOOT_OPTS=%BOOT_OPTS% -Djava.endorsed.dirs="%SERVICEMIX_HOME%\lib\endorsed"
+
+rem Execute the JVM or the load the profiler
+if "%SERVICEMIX_PROFILER%" == "" goto :EXECUTE
+ rem Execute the profiler if it has been configured
+ call :warn Loading profiler script: %SERVICEMIX_PROFILER_SCRIPT%
+ call %SERVICEMIX_PROFILER_SCRIPT%
+
+:EXECUTE
+ rem Execute the Java Virtual Machine
+ cd "%SERVICEMIX_HOME%"
+ "%JAVA%" %JAVA_OPTS% -Dservicemix.home="%SERVICEMIX_HOME%" -jar "%SERVICEMIX_HOME%\bin\bootstrapper.jar" "%SERVICEMIX_HOME%" start
+
+rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+:END
+
+endlocal
+
+if not "%PAUSE%" == "" pause
+
+:END_NO_PAUSE
+
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh Mon Sep 17 02:59:33 2007
@@ -0,0 +1,247 @@
+#!/bin/sh
+#
+# 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.
+#
+# $Id: servicemix 979 2005-11-30 22:50:55Z bsnyder $
+#
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+#
+# Check/Set up some easily accessible MIN/MAX params for JVM mem usage
+#
+
+if [ "x$JAVA_MIN_MEM" = "x" ]; then
+ JAVA_MIN_MEM=128M
+ export JAVA_MIN_MEM
+fi
+
+if [ "x$JAVA_MAX_MEM" = "x" ]; then
+ JAVA_MAX_MEM=512M
+ export JAVA_MAX_MEM
+fi
+
+detectOS() {
+ # OS specific support (must be 'true' or 'false').
+ cygwin=false;
+ darwin=false;
+ aix=false;
+ os400=false;
+ case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+ Darwin*)
+ darwin=true
+ ;;
+ AIX*)
+ aix=true
+ ;;
+ OS400*)
+ os400=true
+ ;;
+ esac
+ # For AIX, set an environment variable
+ if $aix; then
+ export LDR_CNTRL=MAXDATA=0xB0000000@DSA
+ export IBM_JAVA_HEAPDUMP_TEXT=true
+ echo $LDR_CNTRL
+ fi
+}
+
+unlimitFD() {
+ # Use the maximum available, or set MAX_FD != -1 to use that
+ if [ "x$MAX_FD" = "x" ]; then
+ MAX_FD="maximum"
+ fi
+
+ # Increase the maximum file descriptors if we can
+ if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ]; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
+ # use the system max
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+
+ ulimit -n $MAX_FD
+ # echo "ulimit -n" `ulimit -n`
+ if [ $? -ne 0 ]; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+ fi
+}
+
+locateHome() {
+ if [ "x$SERVICEMIX_HOME" != "x" ]; then
+ warn "Ignoring predefined value for SERVICEMIX_HOME"
+ fi
+
+ SERVICEMIX_HOME=`cd $DIRNAME/..; pwd`
+ if [ ! -d "$SERVICEMIX_HOME" ]; then
+ die "SERVICEMIX_HOME is not valid: $SERVICEMIX_HOME"
+ fi
+}
+
+setupNativePath() {
+ # Support for loading native libraries
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$SERVICEMIX_HOME/lib"
+
+ # For Cygwin, set PATH from LD_LIBRARY_PATH
+ if $cygwin; then
+ LD_LIBRARY_PATH=`cygpath --path --windows "$LD_LIBRARY_PATH"`
+ PATH="$PATH;$LD_LIBRARY_PATH"
+ export PATH
+ fi
+ export LD_LIBRARY_PATH
+}
+
+locateJava() {
+ # Setup the Java Virtual Machine
+ if $cygwin ; then
+ [ -n "$JAVA" ] && JAVA=`cygpath --unix "$JAVA"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ fi
+
+ if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+ if [ ! -d "$JAVA_HOME" ]; then
+ die "JAVA_HOME is not valid: $JAVA_HOME"
+ fi
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ warn "JAVA_HOME not set; results may vary"
+ JAVA="java"
+ fi
+ fi
+}
+
+detectJVM() {
+ #echo "`$JAVA -version`"
+ # This service should call `java -version`,
+ # read stdout, and look for hints
+ if $JAVA -version 2>&1 | grep "^IBM" ; then
+ JVM_VENDOR="IBM"
+ # on OS/400, java -version does not contain IBM explicitly
+ elif $os400; then
+ JVM_VENDOR="IBM"
+ else
+ JVM_VENDOR="SUN"
+ fi
+ # echo "JVM vendor is $JVM_VENDOR"
+}
+
+setupDebugOptions() {
+ if [ "x$JAVA_OPTS" = "x" ]; then
+ JAVA_OPTS="$DEFAULT_JAVA_OPTS"
+ fi
+ export JAVA_OPTS
+
+ # Set Debug options if enabled
+ if [ "x$SERVICEMIX_DEBUG" != "x" ]; then
+ # Use the defaults if JAVA_DEBUG_OPTS was not set
+ if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
+ JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
+ fi
+
+ JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS"
+ warn "Enabling Java debug options: $JAVA_DEBUG_OPTS"
+ fi
+}
+
+setupDefaults() {
+ DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM "
+
+ #Set the JVM_VENDOR specific JVM flags
+ if [ "$JVM_VENDOR" = "SUN" ]; then
+ DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS"
+ elif [ "$JVM_VENDOR" = "IBM" ]; then
+ if $os400; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"
+ elif $aix; then
+ DEFAULT_JAVA_OPTS="-Xverify:none -Xlp $DEFAULT_JAVA_OPTS"
+ else
+ DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS"
+ fi
+ fi
+
+ # Add the conf directory so it picks up the Log4J config
+ CLASSPATH="$CLASSPATH:$SERVICEMIX_HOME/conf"
+ DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
+
+ ##
+ ## TODO: Move to conf/profiler/yourkit.{sh|cmd}
+ ##
+ # Uncomment to enable YourKit profiling
+ #DEFAULT_JAVA_DEBUG_OPTS="-Xrunyjpagent"
+}
+
+init() {
+ # Determine if there is special OS handling we must perform
+ detectOS
+
+ # Unlimit the number of file descriptors if possible
+ unlimitFD
+
+ # Locate the ServiceMix home directory
+ locateHome
+
+ # Setup the native library path
+ setupNativePath
+
+ # Locate the Java VM to execute
+ locateJava
+
+ # Determine the JVM vendor
+ detectJVM
+
+ # Setup default options
+ setupDefaults
+
+ # Install debug options
+ setupDebugOptions
+
+}
+
+run() {
+ JAR=$SERVICEMIX_HOME/bin/bootstrapper.jar
+ CLASSPATH=$SERVICEMIX_HOME/bin/bootstrapper.jar:$SERVICEMIX_HOME/bin/daemon.jar:$SERVICEMIX_HOME/bin/logger.jar:$SERVICEMIX_HOME/bin/servicemix.jar
+ if $cygwin; then
+ SERVICEMIX_HOME=`cygpath --path --windows "$SERVICEMIX_HOME"`
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ CLASSWORLDS_CONF=`cygpath --path --windows "$CLASSWORLDS_CONF"`
+ CYGHOME=`cygpath --windows "$HOME"`
+ JAR=`cygpath --windows "$JAR"`
+ fi
+ cd "$SERVICEMIX_HOME"
+ if [ "x$1" = "x" ] ; then
+ #exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -jar "$JAR" "$SERVICEMIX_HOME" start
+ exec $JAVA $JAVA_OPTS -Dfelix.config.properties=file:$SERVICEMIX_HOME/conf/config.properties -Dservicemix.home="$SERVICEMIX_HOME" -jar bin/servicemix.jar
+ else
+ exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -jar "$JAR" "$SERVICEMIX_HOME" "$1"
+ fi
+}
+
+main() {
+ init
+ run $@
+}
+
+main $@
Propchange: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/servicemix.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/unix_shortcuts.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/unix_shortcuts.xml?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/unix_shortcuts.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/unix_shortcuts.xml Mon Sep 17 02:59:33 2007
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--
+
+ 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.
+-->
+
+<shortcuts>
+ <programGroup defaultName="${app}" location="applications"/>
+
+ <shortcut
+ name="Start ${app} Server"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="sh"
+ workingDirectory="$INSTALL_PATH/bin"
+ commandLine="$INSTALL_PATH/bin/${server.init} start"
+ iconFile="$INSTALL_PATH/${app.icon}"
+ type="Application"
+ encoding="UTF-8"
+ description="Start ${app} Server">
+ <createForPack name="Binaries"/>
+ </shortcut>
+
+ <shortcut
+ name="Stop ${app} Server"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="sh"
+ workingDirectory="$INSTALL_PATH/bin"
+ commandLine="$INSTALL_PATH/bin/${server.init} stop"
+ iconFile="$INSTALL_PATH/${app.icon}"
+ type="Application"
+ encoding="UTF-8"
+ description="Start ${app} Server">
+ <createForPack name="Binaries"/>
+ </shortcut>
+
+ <shortcut
+ name="Debug ${app} Server"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="sh"
+ workingDirectory="$INSTALL_PATH/bin"
+ commandLine="$INSTALL_PATH/bin/${server.init} debug"
+ iconFile="$INSTALL_PATH/${app.icon}"
+ type="Application"
+ encoding="UTF-8"
+ description="Start ${app} Server">
+ <createForPack name="Binaries"/>
+ </shortcut>
+
+ <shortcut
+ name="Uninstaller"
+ programGroup="yes"
+ desktop="no"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="java"
+ commandLine="java -jar "$INSTALL_PATH/Uninstaller/uninstaller.jar""
+ initialState="noShow"
+ iconFile="trashcan_full"
+ iconIndex="0"
+ workingDirectory=""
+ type="Application"
+ encoding="UTF-8"
+ description="Uninstall ${app} Server">
+ <createForPack name="Binaries" />
+ </shortcut>
+</shortcuts>
Modified: incubator/servicemix/branches/servicemix-4.0/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/pom.xml?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/pom.xml Mon Sep 17 02:59:33 2007
@@ -37,13 +37,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
+ <version>${felix.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Endpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Endpoint.java?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Endpoint.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Endpoint.java Mon Sep 17 02:59:33 2007
@@ -18,7 +18,7 @@
/**
* Represents an endpoint to expose in the NMR.
- * Exposing an endpoint in the NMR is done using the (@link Registry}.
+ * Exposing an endpoint in the NMR is done using the (@link EndpointRegistry}.
*
* The endpoint will be given Exchange to process and must be prepared to
* be given several exchanges concurrently for processing.
@@ -28,12 +28,29 @@
*/
public interface Endpoint {
- String ID = "ID";
+ /**
+ * Meta-data key for the unique endpoint name
+ */
+ String NAME = "NAME";
+ /**
+ * Meta-data key for the interface name
+ */
+ String INTERFACE_NAME = "INTERFACE_NAME";
+
+ /**
+ * Meta-data key for the service QName
+ */
String SERVICE_NAME = "SERVICE_NAME";
+ /**
+ * Meta-data key for the endpoint name
+ */
String ENDPOINT_NAME = "ENDPOINT_NAME";
+ /**
+ * Meta-data key for the WSDL url
+ */
String WSDL_URL = "WSDL_URL";
/**
Modified: incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/EndpointRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/EndpointRegistry.java?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/EndpointRegistry.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/EndpointRegistry.java Mon Sep 17 02:59:33 2007
@@ -48,7 +48,7 @@
*
* @param endpoint the endpoint to unregister
*/
- void unregister(Endpoint endpoint);
+ void unregister(Endpoint endpoint, Map<String, ?> properties);
/**
* From a given amount of metadata which could include interface name, service name
Modified: incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java Mon Sep 17 02:59:33 2007
@@ -135,7 +135,7 @@
<T> T getContent(Class<T> type);
/**
- * Set the content of the message
+ * Set the content of the message.
*
* @param content the content of the message
*/
Modified: incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Reference.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Reference.java?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Reference.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Reference.java Mon Sep 17 02:59:33 2007
@@ -20,7 +20,7 @@
/**
* Represents an endpoint reference or a logical endpoint.
- * References are usually obtained from the {@link Registry} and used
+ * References are usually obtained from the {@link EndpointRegistry} and used
* as targets for {@link Exchange}s using the {@link Exchange#setTarget(Reference)}
* method.
*
Modified: incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/event/ListenerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/event/ListenerRegistry.java?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/event/ListenerRegistry.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/event/ListenerRegistry.java Mon Sep 17 02:59:33 2007
@@ -40,7 +40,7 @@
*
* @param listener the listener to remove
*/
- void unregister(Listener listener);
+ void unregister(Listener listener, Map<String, ?> properties);
/**
* Retrieve an iterator of listeners of a certain type
Modified: incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/internal/Flow.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/internal/Flow.java?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/internal/Flow.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/internal/Flow.java Mon Sep 17 02:59:33 2007
@@ -23,6 +23,11 @@
public interface Flow {
/**
+ * Meta-data key for the unique flow identifier
+ */
+ String ID = "ID";
+
+ /**
* Check if this flow can be used to dispatch the given Exchange
*
* @param exchange the exchange to check
Modified: incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/service/ServiceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/service/ServiceRegistry.java?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/service/ServiceRegistry.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/service/ServiceRegistry.java Mon Sep 17 02:59:33 2007
@@ -42,7 +42,7 @@
*
* @param service the service to unregister
*/
- void unregister(T service);
+ void unregister(T service, Map<String, ?> properties);
/**
* Get a set of registered services.
Modified: incubator/servicemix/branches/servicemix-4.0/api/src/test/java/org/apache/servicemix/api/OsgiExample.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/src/test/java/org/apache/servicemix/api/OsgiExample.java?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/src/test/java/org/apache/servicemix/api/OsgiExample.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/src/test/java/org/apache/servicemix/api/OsgiExample.java Mon Sep 17 02:59:33 2007
@@ -48,7 +48,7 @@
// registering an endpoint
Endpoint e = new MyEndpoint();
Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(Endpoint.ID, "my-endpoint");
+ props.put(Endpoint.NAME, "my-endpoint");
props.put(Endpoint.SERVICE_NAME, new QName("urn:namesapce", "service"));
props.put(Endpoint.ENDPOINT_NAME, "foo");
props.put(Endpoint.WSDL_URL, "file:my.wsdl");
@@ -73,7 +73,7 @@
EndpointRegistry reg = null;
Map<String, Object> props = new HashMap<String, Object>();
- props.put(Endpoint.ID, "myEndpoint");
+ props.put(Endpoint.NAME, "myEndpoint");
Reference target = reg.lookup(props);
}
Added: incubator/servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml Mon Sep 17 02:59:33 2007
@@ -0,0 +1,50 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>aopalliance</pkgArtifactId>
+ <pkgVersion>1.0</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.aopalliance</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ </dependencies>
+
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/bundles/commons-logging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/commons-logging/pom.xml?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/commons-logging/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/commons-logging/pom.xml Mon Sep 17 02:59:33 2007
@@ -0,0 +1,80 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>commons-logging</pkgArtifactId>
+ <pkgVersion>1.1</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${felix.version}</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>*;version=${pkgVersion}</Export-Package>
+ <Import-Package>org.apache.log4j;resolution:=optional,
+ com.sun.jdmk.com;resolution:=optional,
+ javax.servlet;resolution:=optional,
+ org.apache.avalon.framework.logger;resolution:=optional,
+ org.apache.log;resolution:=optional,
+ *</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml Mon Sep 17 02:59:33 2007
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<!--
+
+ 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.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <packaging>pom</packaging>
+ <version>4.0-SNAPSHOT</version>
+ <name>ServiceMix OSGI Common Bundles</name>
+
+ <modules>
+ <module>servlet</module>
+ <module>commons-logging</module>
+ <module>aopalliance</module>
+ </modules>
+
+ <properties>
+ <servicemix.osgi.export.pkg></servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg></servicemix.osgi.import.pkg>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${felix.version}</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>${servicemix.osgi.export.pkg}*;version=${pkgVersion}</Export-Package>
+ <Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/bundles/servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/servlet/pom.xml?rev=576332&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/servlet/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/servlet/pom.xml Mon Sep 17 02:59:33 2007
@@ -0,0 +1,49 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>servlet</pkgArtifactId>
+ <pkgVersion>2.5</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-${pkgArtifactId}_${pkgVersion}_spec</artifactId>
+ <version>1.1-M1</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: incubator/servicemix/branches/servicemix-4.0/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/core/pom.xml?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/core/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/core/pom.xml Mon Sep 17 02:59:33 2007
@@ -37,12 +37,12 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>org.apache.servicemix.api</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/EndpointRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/EndpointRegistryImpl.java?rev=576332&r1=576331&r2=576332&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/EndpointRegistryImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/EndpointRegistryImpl.java Mon Sep 17 02:59:33 2007
@@ -49,11 +49,11 @@
this.nmr = nmr;
}
- public NMR getNMR() {
+ public NMR getNmr() {
return this.nmr;
}
- public void setNMR(NMR nmr) {
+ public void setNmr(NMR nmr) {
this.nmr = nmr;
}
@@ -86,9 +86,9 @@
*
* @param endpoint the endpoint to unregister
*/
- public void unregister(Endpoint endpoint) {
+ public void unregister(Endpoint endpoint, Map<String, ?> properties) {
InternalEndpoint wrapper = endpoints.remove(endpoint);
- registry.unregister(wrapper);
+ registry.unregister(wrapper, properties);
}
/**