servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r652401 - in /servicemix/smx4/nmr/trunk: assembly/src/main/filtered-resources/ nmr/core/src/main/java/org/apache/servicemix/nmr/core/
Date Wed, 30 Apr 2008 15:36:30 GMT
Author: gnodet
Date: Wed Apr 30 08:36:26 2008
New Revision: 652401

URL: http://svn.apache.org/viewvc?rev=652401&view=rev
Log:
Add ASF headers and add missing bundle in the feature

Modified:
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java
    servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/Converter.java
    servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/DummyConverter.java

Modified: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=652401&r1=652400&r2=652401&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml Wed Apr 30
08:36:26 2008
@@ -27,10 +27,11 @@
 	</feature>
 	<feature name="jbi">
 		<feature>nmr</feature>
-		<bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
 		<bundle>mvn:org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.version}</bundle>
 		<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>
-        <bundle>mvn:http://svn.apache.org/repos/asf/servicemix/m2-repo!org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
 	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox-3.2.3/${pom.version}</bundle>
 	    <bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.api/${pom.version}</bundle>
 	    <bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.runtime/${pom.version}</bundle>

Modified: servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java?rev=652401&r1=652400&r2=652401&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java
(original)
+++ servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java
Wed Apr 30 08:36:26 2008
@@ -1,17 +1,32 @@
+/*
+ * 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.
+ */
 package org.apache.servicemix.nmr.core;
 
 /**
- * Created by IntelliJ IDEA.
-* User: gnodet
-* Date: Feb 21, 2008
-* Time: 10:42:57 PM
-* To change this template use File | Settings | File Templates.
-*/
+ * A converter using Camel underneath
+ */
 class CamelConverter implements Converter {
+
     final org.apache.camel.impl.converter.DefaultTypeConverter tc =
             new org.apache.camel.impl.converter.DefaultTypeConverter(
                     new org.apache.camel.impl.ReflectionInjector());
+
     public <T> T convert(Object body, Class<T> type) {
         return tc.convertTo(type, body);
     }
+
 }

Modified: servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/Converter.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/Converter.java?rev=652401&r1=652400&r2=652401&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/Converter.java
(original)
+++ servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/Converter.java
Wed Apr 30 08:36:26 2008
@@ -1,12 +1,32 @@
+/*
+ * 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.
+ */
 package org.apache.servicemix.nmr.core;
 
 /**
- * Created by IntelliJ IDEA.
-* User: gnodet
-* Date: Feb 21, 2008
-* Time: 10:42:38 PM
-* To change this template use File | Settings | File Templates.
-*/
+ * Allow pluggable conversion strategies
+ */
 interface Converter {
+
+    /**
+     * Convert the body to the given class
+     * @param body the object to convert
+     * @param type the expected type
+     * @return a converted object or null
+     */
     <T> T convert(Object body, Class<T> type);
+
 }

Modified: servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/DummyConverter.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/DummyConverter.java?rev=652401&r1=652400&r2=652401&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/DummyConverter.java
(original)
+++ servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/DummyConverter.java
Wed Apr 30 08:36:26 2008
@@ -1,14 +1,28 @@
+/*
+ * 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.
+ */
 package org.apache.servicemix.nmr.core;
 
 /**
- * Created by IntelliJ IDEA.
-* User: gnodet
-* Date: Feb 21, 2008
-* Time: 10:43:10 PM
-* To change this template use File | Settings | File Templates.
-*/
+ * A dummy converter, that actually does nothing.
+ */
 class DummyConverter implements Converter {
+
     public <T> T convert(Object body, Class<T> type) {
         return null;
     }
+
 }



Mime
View raw message