Copied: servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure.xml (from r967263, servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/security/secure.xml) URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure.xml?p2=servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure.xml&p1=servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/security/secure.xml&r1=967263&r2=986856&rev=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/security/secure.xml (original) +++ servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure.xml Wed Aug 18 18:55:11 2010 @@ -17,11 +17,35 @@ limitations under the License. --> -<beans xmlns:sm="http://servicemix.apache.org/config/1.0"; +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:sm="http://servicemix.apache.org/config/1.0"; xmlns:ex1="http://servicemix.org/example/1"; - xmlns:ex2="http://servicemix.org/example/2";> + xmlns:ex2="http://servicemix.org/example/2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${project.version}.xsd"; > <sm:container id="jbi" embedded="true" useMBeanServer="false"> + <sm:activationSpecs> + <sm:activationSpec id="receiver1" service="ex1:receiver1"> + <sm:component> + <bean class="org.apache.servicemix.tck.ReceiverComponent" /> + </sm:component> + </sm:activationSpec> + <sm:activationSpec id="receiver2" service="ex1:receiver2"> + <sm:component> + <bean class="org.apache.servicemix.tck.ReceiverComponent" /> + </sm:component> + </sm:activationSpec> + <sm:activationSpec id="receiver3" service="ex2:receiver1"> + <sm:component> + <bean class="org.apache.servicemix.tck.ReceiverComponent" /> + </sm:component> + </sm:activationSpec> + </sm:activationSpecs> + + <sm:broker> <sm:securedBroker> <sm:authorizationMap> @@ -35,24 +59,6 @@ </sm:authorizationMap> </sm:securedBroker> </sm:broker> - - <sm:activationSpecs> - <sm:activationSpec id="receiver1" service="ex1:receiver1"> - <sm:component> - <bean class="org.apache.servicemix.tck.ReceiverComponent" /> - </sm:component> - </sm:activationSpec> - <sm:activationSpec id="receiver2" service="ex1:receiver2"> - <sm:component> - <bean class="org.apache.servicemix.tck.ReceiverComponent" /> - </sm:component> - </sm:activationSpec> - <sm:activationSpec id="receiver3" service="ex2:receiver1"> - <sm:component> - <bean class="org.apache.servicemix.tck.ReceiverComponent" /> - </sm:component> - </sm:activationSpec> - </sm:activationSpecs> </sm:container> </beans>
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure2.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure2.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure2.xml (original) +++ servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure2.xml Wed Aug 18 18:55:11 2010 @@ -17,30 +17,18 @@ limitations under the License. --> -<beans xmlns:sm="http://servicemix.apache.org/config/1.0"; +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:sm="http://servicemix.apache.org/config/1.0"; xmlns:container1="http://servicemix.org/example/1"; xmlns:container1a="http://servicemix.org/example/1a"; xmlns:container2="http://servicemix.org/example/2"; - xmlns:container2a="http://servicemix.org/example/2a";> + xmlns:container2a="http://servicemix.org/example/2a"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${project.version}.xsd"; > <sm:container id="jbi1" embedded="true" useMBeanServer="false" name="ServiceMix1"> - <sm:broker> - <sm:securedBroker> - <sm:authorizationMap> - <sm:authorizationMap> - <sm:authorizationEntries> - <sm:authorizationEntry service="*:*" roles="programmers" /> - <sm:authorizationEntry service="container1:*" roles="accounting" /> - <sm:authorizationEntry service="container1:receiver1" roles="testers" /> - </sm:authorizationEntries> - </sm:authorizationMap> - </sm:authorizationMap> - <sm:flows> - <sm:jmsFlow jmsURL="tcp://localhost:${activemq.port}" /> - </sm:flows> - </sm:securedBroker> - </sm:broker> - <sm:activationSpecs> <sm:activationSpec id="receiver11" service="container1:receiver1"> <sm:component> @@ -58,17 +46,15 @@ </sm:component> </sm:activationSpec> </sm:activationSpecs> - </sm:container> - <sm:container id="jbi2" embedded="true" useMBeanServer="false" name="ServiceMix2"> <sm:broker> <sm:securedBroker> <sm:authorizationMap> <sm:authorizationMap> <sm:authorizationEntries> <sm:authorizationEntry service="*:*" roles="programmers" /> - <sm:authorizationEntry service="container2:*" roles="accounting" /> - <sm:authorizationEntry service="container2:receiver1" roles="testers" /> + <sm:authorizationEntry service="container1:*" roles="accounting" /> + <sm:authorizationEntry service="container1:receiver1" roles="testers" /> </sm:authorizationEntries> </sm:authorizationMap> </sm:authorizationMap> @@ -77,7 +63,9 @@ </sm:flows> </sm:securedBroker> </sm:broker> + </sm:container> + <sm:container id="jbi2" embedded="true" useMBeanServer="false" name="ServiceMix2"> <sm:activationSpecs> <sm:activationSpec id="receiver21" service="container2:receiver1"> <sm:component> @@ -95,6 +83,23 @@ </sm:component> </sm:activationSpec> </sm:activationSpecs> + + <sm:broker> + <sm:securedBroker> + <sm:authorizationMap> + <sm:authorizationMap> + <sm:authorizationEntries> + <sm:authorizationEntry service="*:*" roles="programmers" /> + <sm:authorizationEntry service="container2:*" roles="accounting" /> + <sm:authorizationEntry service="container2:receiver1" roles="testers" /> + </sm:authorizationEntries> + </sm:authorizationMap> + </sm:authorizationMap> + <sm:flows> + <sm:jmsFlow jmsURL="tcp://localhost:${activemq.port}" /> + </sm:flows> + </sm:securedBroker> + </sm:broker> </sm:container> </beans> Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java (original) +++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java Wed Aug 18 18:55:11 2010 @@ -91,7 +91,7 @@ public class SpringSecuredBrokerTest ext protected AbstractXmlApplicationContext createBeanFactory() { return new ClassPathXmlApplicationContext("org/apache/servicemix/jbi/security/secure.xml"); } - + protected Subject login(final String username, final String password) throws Exception { LoginContext context = new LoginContext("servicemix-domain", new CallbackHandler() { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml (original) +++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml Wed Aug 18 18:55:11 2010 @@ -62,6 +62,12 @@ </dependencies> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.apache.servicemix.tooling</groupId> Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/resources/org/apache/servicemix/lwcontainer/su1-src/servicemix.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/resources/org/apache/servicemix/lwcontainer/su1-src/servicemix.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/resources/org/apache/servicemix/lwcontainer/su1-src/servicemix.xml (original) +++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/resources/org/apache/servicemix/lwcontainer/su1-src/servicemix.xml Wed Aug 18 18:55:11 2010 @@ -18,8 +18,14 @@ --> <!-- START SNIPPET: servicemix --> -<beans xmlns:my="http://servicemix.apache.org/demo/"; - xmlns:sm="http://servicemix.apache.org/config/1.0";> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:sm="http://servicemix.apache.org/config/1.0"; + xmlns:my="http://servicemix.apache.org/demo/"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${project.version}.xsd"; > + <sm:serviceunit id="jbi"> <sm:activationSpecs> Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/resources/org/apache/servicemix/lwcontainer/su2-src/servicemix.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/resources/org/apache/servicemix/lwcontainer/su2-src/servicemix.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/resources/org/apache/servicemix/lwcontainer/su2-src/servicemix.xml (original) +++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/resources/org/apache/servicemix/lwcontainer/su2-src/servicemix.xml Wed Aug 18 18:55:11 2010 @@ -18,9 +18,14 @@ --> <!-- START SNIPPET: servicemix --> -<beans xmlns:my="http://servicemix.apache.org/demo/"; - xmlns:sm="http://servicemix.apache.org/config/1.0"; - xmlns:quartz="http://servicemix.apache.org/quartz/1.0";> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:sm="http://servicemix.apache.org/config/1.0"; + xmlns:my="http://servicemix.apache.org/demo/"; + xmlns:quartz="http://servicemix.apache.org/quartz/1.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${project.version}.xsd"; > <classpath inverse="true"> <component>servicemix-quartz</component> Modified: servicemix/smx3/trunk/distributions/apache-servicemix-web/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix-web/pom.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/distributions/apache-servicemix-web/pom.xml (original) +++ servicemix/smx3/trunk/distributions/apache-servicemix-web/pom.xml Wed Aug 18 18:55:11 2010 @@ -44,7 +44,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> + <version>2.5</version> <scope>provided</scope> </dependency> <dependency> @@ -174,6 +174,13 @@ </dependencies> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> Added: servicemix/smx3/trunk/distributions/apache-servicemix-web/src/test/resources/org/apache/servicemix/http/test.wsdl URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix-web/src/test/resources/org/apache/servicemix/http/test.wsdl?rev=986856&view=auto ============================================================================== --- servicemix/smx3/trunk/distributions/apache-servicemix-web/src/test/resources/org/apache/servicemix/http/test.wsdl (added) +++ servicemix/smx3/trunk/distributions/apache-servicemix-web/src/test/resources/org/apache/servicemix/http/test.wsdl Wed Aug 18 18:55:11 2010 @@ -0,0 +1,68 @@ +<?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. + +--> +<wsdl:definitions targetNamespace="http://servicemix.org/test/"; xmlns:tns="http://servicemix.org/test/"; xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://www.w3.org/2003/05/soap-envelope"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:soapenc11="http://schemas.xmlsoap.org/soap/encoding/"; xmlns:soapenc12="http://www.w3.org/2003/05/soap-encoding"; xmlns:soap11="http://schemas.xmlsoap.org/soap/envelope/"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";> + <wsdl:types> + <xsd:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://servicemix.org/test/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema";> + <xsd:element name="echo"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="1" name="msg" nillable="true" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="echoResponse"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="1" name="out" nillable="true" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:schema> + </wsdl:types> + <wsdl:message name="echoResponse"> + <wsdl:part name="parameters" element="tns:echoResponse"/> + </wsdl:message> + <wsdl:message name="echoRequest"> + <wsdl:part name="parameters" element="tns:echo"/> + </wsdl:message> + <wsdl:portType name="HelloPortType"> + <wsdl:operation name="echo"> + <wsdl:input name="echoRequest" message="tns:echoRequest"/> + <wsdl:output name="echoResponse" message="tns:echoResponse"/> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="testServiceBinding" type="tns:HelloPortType"> + <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echo"> + <wsdlsoap:operation soapAction=""/> + <wsdl:input name="echoRequest"> + <wsdlsoap:body use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <wsdlsoap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="Hello"> + <wsdl:port name="testService" binding="tns:testServiceBinding"> + <wsdlsoap:address location="http://localhost:8194/Service/"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Modified: servicemix/smx3/trunk/distributions/apache-servicemix-web/src/test/resources/org/apache/servicemix/web/http/spring-web.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix-web/src/test/resources/org/apache/servicemix/web/http/spring-web.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/distributions/apache-servicemix-web/src/test/resources/org/apache/servicemix/web/http/spring-web.xml (original) +++ servicemix/smx3/trunk/distributions/apache-servicemix-web/src/test/resources/org/apache/servicemix/web/http/spring-web.xml Wed Aug 18 18:55:11 2010 @@ -17,9 +17,14 @@ limitations under the License. --> -<beans xmlns:sm="http://servicemix.apache.org/config/1.0"; - xmlns:http="http://servicemix.apache.org/http/1.0"; - xmlns:test="http://servicemix.org/test/";> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:sm="http://servicemix.apache.org/config/1.0"; + xmlns:http="http://servicemix.apache.org/http/1.0"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${project.version}.xsd + http://servicemix.apache.org/http/1.0 http://servicemix.apache.org/http/1.0/servicemix-http.xsd";> <!-- the JBI container --> <sm:container id="jbi" embedded="true"> Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original) +++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Wed Aug 18 18:55:11 2010 @@ -204,6 +204,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + <version>${spring-version}</version> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${spring-version}</version> @@ -220,6 +225,11 @@ </dependency> <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring-version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> <version>${spring-version}</version> </dependency> Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml (original) +++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml Wed Aug 18 18:55:11 2010 @@ -138,11 +138,13 @@ <include>org.apache.xbean:xbean-classloader</include> <include>wsdl4j:wsdl4j</include> <include>org.apache.woden:woden</include> + <include>org.springframework:spring-aop</include> + <include>org.springframework:spring-asm</include> <include>org.springframework:spring-core</include> <include>org.springframework:spring-beans</include> <include>org.springframework:spring-context</include> + <include>org.springframework:spring-expression</include> <include>org.springframework:spring-tx</include> - <include>org.springframework:spring-aop</include> <include>aopalliance:aopalliance</include> <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include> <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include> Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml (original) +++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml Wed Aug 18 18:55:11 2010 @@ -130,11 +130,13 @@ <include>org.apache.xbean:xbean-classloader</include> <include>wsdl4j:wsdl4j</include> <include>org.apache.woden:woden</include> + <include>org.springframework:spring-aop</include> + <include>org.springframework:spring-asm</include> <include>org.springframework:spring-core</include> <include>org.springframework:spring-beans</include> <include>org.springframework:spring-context</include> + <include>org.springframework:spring-expression</include> <include>org.springframework:spring-tx</include> - <include>org.springframework:spring-aop</include> <include>aopalliance:aopalliance</include> <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include> <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include> Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/security.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/security.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/security.xml (original) +++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/security.xml Wed Aug 18 18:55:11 2010 @@ -21,7 +21,7 @@ <!-- Authentication service --> <sm:authenticationService id="authenticationService" /> - + <!-- KeyStore manager --> <sm:keystoreManager id="keystoreManager"> <sm:keystores> Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml (original) +++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml Wed Aug 18 18:55:11 2010 @@ -17,8 +17,15 @@ limitations under the License. --> -<beans xmlns:sm="http://servicemix.apache.org/config/1.0"; - xmlns:audit="http://servicemix.apache.org/audit/1.0";> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:audit="http://servicemix.apache.org/audit/1.0"; + xmlns:sm="http://servicemix.apache.org/config/1.0"; + xmlns:http="http://servicemix.apache.org/http/1.0"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core.xsd + http://servicemix.apache.org/audit/1.0 http://servicemix.apache.org/schema/servicemix-audit.xsd";> <!-- System properties --> <sm:systemProperties> @@ -45,18 +52,19 @@ <import resource="classpath:jndi.xml" /> <!-- the JBI container --> - <sm:container id="jbi" - rootDir="./data/smx" + <sm:container id="jbi" + rootDir="./data/smx" MBeanServer="#jmxServer" installationDirPath="./hotdeploy" monitorDeploymentDirectory="false" monitorInterval="1" transactionManager="#transactionManager" - createJmxConnector="false" - depends-on="jndi"> + createJmxConnector="false"> + + <sm:activationSpecs/> <!-- Use a secured broker (see security.xml) - and define the 3 standard flows --> + and define the 3 standard flows --> <sm:broker> <sm:securedBroker authorizationMap="#authorizationMap"> <sm:flows> @@ -68,10 +76,6 @@ </sm:securedBroker> </sm:broker> - <sm:services> - <sm:statistics statsInterval="10" dumpStats="true" /> - </sm:services> - <sm:executorFactory> <bean class="org.apache.servicemix.executors.impl.ExecutorFactoryImpl"> <property name="defaultConfig"> @@ -84,18 +88,19 @@ </bean> </sm:executorFactory> - <sm:activationSpecs> + <sm:services> + <sm:statistics statsInterval="10" dumpStats="true" /> + </sm:services> - </sm:activationSpecs> </sm:container> <audit:jdbcAuditor container="#jbi" autoStart="false"> - <audit:dataSource> + <audit:dataSource> <bean class="org.apache.derby.jdbc.EmbeddedDataSource"> <property name="databaseName" value="servicemixDB"/> <property name="createDatabase" value="create"/> </bean> - </audit:dataSource> + </audit:dataSource> </audit:jdbcAuditor> <sm:dotViewService container="#jbi" autoStart="true" /> Modified: servicemix/smx3/trunk/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/pom.xml (original) +++ servicemix/smx3/trunk/pom.xml Wed Aug 18 18:55:11 2010 @@ -60,34 +60,34 @@ <properties> <servicemix-utils-version>1.2.0</servicemix-utils-version> <servicemix-specs-version>1.4.0</servicemix-specs-version> - <servicemix-common-version>2010.01</servicemix-common-version> - <servicemix-shared-version>2010.01</servicemix-shared-version> - <servicemix-quartz-version>2010.01</servicemix-quartz-version> - <servicemix-jms-version>2010.01</servicemix-jms-version> - <servicemix-jsr181-version>2010.01</servicemix-jsr181-version> - <servicemix-http-version>2010.01</servicemix-http-version> - <servicemix-mail-version>2010.01</servicemix-mail-version> - <servicemix-osworkflow-version>2010.01</servicemix-osworkflow-version> - <servicemix-wsn2005-version>2010.01</servicemix-wsn2005-version> + <servicemix-common-version>2010.02-SNAPSHOT</servicemix-common-version> + <servicemix-shared-version>2010.02-SNAPSHOT</servicemix-shared-version> + <servicemix-quartz-version>2010.02-SNAPSHOT</servicemix-quartz-version> + <servicemix-jms-version>2010.02-SNAPSHOT</servicemix-jms-version> + <servicemix-jsr181-version>2010.02-SNAPSHOT</servicemix-jsr181-version> + <servicemix-http-version>2010.02-SNAPSHOT</servicemix-http-version> + <servicemix-mail-version>2010.02-SNAPSHOT</servicemix-mail-version> + <servicemix-osworkflow-version>2010.02-SNAPSHOT</servicemix-osworkflow-version> + <servicemix-wsn2005-version>2010.02-SNAPSHOT</servicemix-wsn2005-version> <servicemix-lwcontainer-version>3.3.2</servicemix-lwcontainer-version> - <servicemix-bean-version>2010.01</servicemix-bean-version> - <servicemix-eip-version>2010.01</servicemix-eip-version> - <servicemix-script-version>2010.01</servicemix-script-version> - <servicemix-scripting-version>2010.01</servicemix-scripting-version> - <servicemix-validation-version>2010.01</servicemix-validation-version> - <servicemix-ftp-version>2010.01</servicemix-ftp-version> - <servicemix-xmpp-version>2010.01</servicemix-xmpp-version> - <servicemix-saxon-version>2010.01</servicemix-saxon-version> - <servicemix-truezip-version>2010.01</servicemix-truezip-version> - <servicemix-camel-version>2010.01</servicemix-camel-version> - <servicemix-cxf-bc-version>2010.01</servicemix-cxf-bc-version> - <servicemix-cxf-se-version>2010.01</servicemix-cxf-se-version> - <servicemix-drools-version>2010.01</servicemix-drools-version> - <servicemix-file-version>2010.01</servicemix-file-version> - <servicemix-snmp-version>2010.01</servicemix-snmp-version> - <servicemix-smpp-version>2010.01</servicemix-smpp-version> - <servicemix-exec-version>2010.01</servicemix-exec-version> - <servicemix-vfs-version>2010.01</servicemix-vfs-version> + <servicemix-bean-version>2010.02-SNAPSHOT</servicemix-bean-version> + <servicemix-eip-version>2010.02-SNAPSHOT</servicemix-eip-version> + <servicemix-script-version>2010.02-SNAPSHOT</servicemix-script-version> + <servicemix-scripting-version>2010.02-SNAPSHOT</servicemix-scripting-version> + <servicemix-validation-version>2010.02-SNAPSHOT</servicemix-validation-version> + <servicemix-ftp-version>2010.02-SNAPSHOT</servicemix-ftp-version> + <servicemix-xmpp-version>2010.02-SNAPSHOT</servicemix-xmpp-version> + <servicemix-saxon-version>2010.02-SNAPSHOT</servicemix-saxon-version> + <servicemix-truezip-version>2010.02-SNAPSHOT</servicemix-truezip-version> + <servicemix-camel-version>2010.02-SNAPSHOT</servicemix-camel-version> + <servicemix-cxf-bc-version>2010.02-SNAPSHOT</servicemix-cxf-bc-version> + <servicemix-cxf-se-version>2010.02-SNAPSHOT</servicemix-cxf-se-version> + <servicemix-drools-version>2010.02-SNAPSHOT</servicemix-drools-version> + <servicemix-file-version>2010.02-SNAPSHOT</servicemix-file-version> + <servicemix-snmp-version>2010.02-SNAPSHOT</servicemix-snmp-version> + <servicemix-smpp-version>2010.02-SNAPSHOT</servicemix-smpp-version> + <servicemix-exec-version>2010.02-SNAPSHOT</servicemix-exec-version> + <servicemix-vfs-version>2010.02-SNAPSHOT</servicemix-vfs-version> <jbi-plugin-version>4.3</jbi-plugin-version> <res-maven-plugin-version>4.1</res-maven-plugin-version> @@ -96,8 +96,8 @@ <xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version> <xfire-version>1.2.5</xfire-version> <mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion> - <xbean-version>3.4.3</xbean-version> - <spring-version>2.5.6</spring-version> + <xbean-version>3.7</xbean-version> + <spring-version>3.0.3.RELEASE</spring-version> <activemq-version>5.4-SNAPSHOT</activemq-version> <activeio-version>3.1.2</activeio-version> <camel-version>2.4.0</camel-version> @@ -1408,14 +1408,14 @@ <!-- Spring Framework --> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-aop</artifactId> <version>${spring-version}</version> - </dependency> + </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> + <artifactId>spring-asm</artifactId> <version>${spring-version}</version> - </dependency> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> @@ -1430,7 +1430,12 @@ <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> <version>${spring-version}</version> - </dependency> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring-version}</version> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> Modified: servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml (original) +++ servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml Wed Aug 18 18:55:11 2010 @@ -132,8 +132,14 @@ </dependencies> <build> - <plugins> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> <!-- || lets enable the jbi-maven-plugin so that we auto-generate || the META-INF/maven/dependencies.properties file Modified: servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml (original) +++ servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml Wed Aug 18 18:55:11 2010 @@ -22,8 +22,8 @@ xmlns:sm="http://servicemix.apache.org/config/1.0"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://servicemix.apache.org/config/1.0 http://repo1.maven.org/maven2/org/apache/servicemix/servicemix-core/3.1.2/servicemix-core-3.1.2.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/activemq-core.xsd + http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${project.version}.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> <!-- Run a local ActiveMQ broker for testing --> Modified: servicemix/smx3/trunk/web/servicemix-console/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/web/servicemix-console/pom.xml?rev=986856&r1=986855&r2=986856&view=diff ============================================================================== --- servicemix/smx3/trunk/web/servicemix-console/pom.xml (original) +++ servicemix/smx3/trunk/web/servicemix-console/pom.xml Wed Aug 18 18:55:11 2010 @@ -44,10 +44,6 @@ <artifactId>servicemix-audit</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.0.1B_spec</artifactId> </dependency>
