You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2007/12/12 21:03:52 UTC
svn commit: r603721 - in /activemq/camel/trunk/components/camel-cxf/src:
main/java/org/apache/camel/component/cxf/transport/spring/
main/resources/schema/configuration/ test/resources/
test/resources/org/apache/camel/component/cxf/transport/
Author: hadrian
Date: Wed Dec 12 12:03:52 2007
New Revision: 603721
URL: http://svn.apache.org/viewvc?rev=603721&view=rev
Log:
More missing files from patch for camel-258
Added:
activemq/camel/trunk/components/camel-cxf/src/main/resources/schema/configuration/
activemq/camel/trunk/components/camel-cxf/src/main/resources/schema/configuration/camel.xsd (with props)
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java
activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties
activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml
activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelDestination.xml
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java?rev=603721&r1=603720&r2=603721&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java Wed Dec 12 12:03:52 2007
@@ -30,20 +30,20 @@
public class AbstractCamelContextBeanDefinitionParser extends AbstractBeanDefinitionParser {
private static final String DEFAULT_CAMEL_CONTEXT_NAME = "camelContext";
-
+
private String getContextId(String contextId) {
if (ObjectHelper.isNullOrBlank(contextId)) {
//set the contextId default value here
- return DEFAULT_CAMEL_CONTEXT_NAME;
+ return DEFAULT_CAMEL_CONTEXT_NAME;
} else {
return contextId;
}
}
-
+
protected void wireCamelContext(BeanDefinitionBuilder bean, String camelContextId) {
bean.addPropertyReference("camelContext", camelContextId);
}
-
+
protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
// paser the id attribute
bean.setAbstract(true);
@@ -56,13 +56,13 @@
// paraser the camel context
BeanDefinition bd = ctx.getDelegate().parseCustomElement((Element)n);
// get the inner camel context id
- String contextId = (String)bd.getPropertyValues().getPropertyValue("id").getValue();
- bean.addPropertyReference("camelContext", getContextId(contextId));
+ String contextId = (String)bd.getPropertyValues().getPropertyValue("id").getValue();
+ bean.addPropertyReference("camelContext", getContextId(contextId));
} else if ("camelContextRef".equals(name)){
- String contextId = n.getTextContent();
+ String contextId = n.getTextContent();
bean.addPropertyReference("camelContext", getContextId(contextId));
- }
+ }
}
- }
- }
+ }
+ }
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java?rev=603721&r1=603720&r2=603721&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java Wed Dec 12 12:03:52 2007
@@ -34,10 +34,10 @@
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
public class CamelConduitDefinitionParser extends AbstractCamelContextBeanDefinitionParser {
-
+
public CamelConduitDefinitionParser() {
super();
setBeanClass(CamelConduit.class);
}
-
+
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java?rev=603721&r1=603720&r2=603721&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java Wed Dec 12 12:03:52 2007
@@ -31,5 +31,5 @@
public CamelDestinationDefinitionParser() {
super();
setBeanClass(CamelDestination.class);
- }
+ }
}
Added: activemq/camel/trunk/components/camel-cxf/src/main/resources/schema/configuration/camel.xsd
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/resources/schema/configuration/camel.xsd?rev=603721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/resources/schema/configuration/camel.xsd (added)
+++ activemq/camel/trunk/components/camel-cxf/src/main/resources/schema/configuration/camel.xsd Wed Dec 12 12:03:52 2007
@@ -0,0 +1,63 @@
+<?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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:camel="http://cxf.apache.org/transports/camel"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
+ xmlns:camel-spring="http://activemq.apache.org/camel/schema/spring"
+ targetNamespace="http://cxf.apache.org/transports/camel"
+ elementFormDefault="qualified" jaxb:version="2.0">
+
+
+ <xs:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+ <xs:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+ <xs:import namespace="http://activemq.apache.org/camel/schema/spring" schemaLocation="http://activemq.apache.org/camel/schema/spring/camel-spring.xsd"/>
+
+ <xs:element name="destination">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="beans:identifiedType">
+ <xs:sequence>
+ <xs:element ref="camel-spring:camelContext" minOccurs="0"/>
+ <xs:element name="camelContextRef" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="cxf-beans:beanAttributes"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="conduit">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="beans:identifiedType">
+ <xs:sequence>
+ <xs:element ref="camel-spring:camelContext" minOccurs="0"/>
+ <xs:element name="camelContextRef" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="cxf-beans:beanAttributes"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
Propchange: activemq/camel/trunk/components/camel-cxf/src/main/resources/schema/configuration/camel.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties?rev=603721&r1=603720&r2=603721&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties Wed Dec 12 12:03:52 2007
@@ -72,3 +72,77 @@
# For example, set the com.xyz.foo logger to only log SEVERE
# messages:
#com.xyz.foo.level = SEVERE
+#
+#
+# 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.
+#
+#
+############################################################
+# Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+# Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler
+# classes. These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+#handlers= java.util.logging.ConsoleHandler
+
+# To also add the FileHandler, use the following line instead.
+#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers. For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= INFO
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+# default file output is in user's home directory.
+java.util.logging.FileHandler.pattern = %h/java%u.log
+java.util.logging.FileHandler.limit = 50000
+java.util.logging.FileHandler.count = 1
+java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
+
+# Limit the message that are printed on the console to INFO and above.
+java.util.logging.ConsoleHandler.level = WARNING
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+#com.xyz.foo.level = SEVERE
Modified: activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml?rev=603721&r1=603720&r2=603721&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelConduit.xml Wed Dec 12 12:03:52 2007
@@ -19,30 +19,33 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://cxf.apache.org/transports/camel"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd
- http://activemq.apache.org/camel/schema/cxfEndpoint http://activemq.apache.org/camel/schema/cxf/cxfEndpoint.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://activemq.apache.org/camel/schema/cxfEndpoint
+ http://activemq.apache.org/camel/schema/cxf/cxfEndpoint.xsd
+ http://activemq.apache.org/camel/schema/spring
+ http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
-
+
<camelContext id="conduit_context" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="direct:EndpointA" />
- <to uri="direct:EndpointB" />
+ <from uri="direct:EndpointA" />
+ <to uri="direct:EndpointB" />
</route>
</camelContext>
-
+
<camel:conduit name="{http://activemq.apache.org/camel-test}portA.camel-conduit">
<camel:camelContextRef>conduit_context</camel:camelContextRef>
</camel:conduit>
-
+
<camel:conduit name="{http://activemq.apache.org/camel-test}portB.camel-conduit">
<camelContext id="context" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="direct:EndpointC" />
- <to uri="direct:EndpointD" />
+ <from uri="direct:EndpointC" />
+ <to uri="direct:EndpointD" />
</route>
- </camelContext>
- </camel:conduit>
-
-</beans>
\ No newline at end of file
+ </camelContext>
+ </camel:conduit>
+
+</beans>
Modified: activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelDestination.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelDestination.xml?rev=603721&r1=603720&r2=603721&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelDestination.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelDestination.xml Wed Dec 12 12:03:52 2007
@@ -17,26 +17,28 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:camel="http://cxf.apache.org/transports/camel"
+ xmlns:camel="http://cxf.apache.org/transports/camel"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd
- http://activemq.apache.org/camel/schema/cxfEndpoint http://activemq.apache.org/camel/schema/cxf/cxfEndpoint.xsd
+ http://activemq.apache.org/camel/schema/cxfEndpoint
+ http://activemq.apache.org/camel/schema/cxf/cxfEndpoint.xsd
http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
-
-
+
+
<camel:destination name="{http://activemq.apache.org/camel-test}port.camel-destination">
<camelContext id="dest_context" xmlns="http://activemq.apache.org/camel/schema/spring">
- <route>
- <from uri="direct:EndpointA" />
- <to uri="direct:EndpointB" />
- </route>
- <route>
- <from uri="direct:EndpointC" />
- <to uri="mock:EndpiontB" />
- </route>
- </camelContext>
+ <route>
+ <from uri="direct:EndpointA"/>
+ <to uri="direct:EndpointB"/>
+ </route>
+ <route>
+ <from uri="direct:EndpointC"/>
+ <to uri="mock:EndpiontB"/>
+ </route>
+ </camelContext>
</camel:destination>
-</beans>
\ No newline at end of file
+</beans>