camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1226449 [5/5] - in /camel/trunk: ./ apache-camel/ apache-camel/src/main/descriptors/ components/ components/camel-mina2/ components/camel-mina2/src/ components/camel-mina2/src/main/ components/camel-mina2/src/main/java/ components/camel-mi...
Date Mon, 02 Jan 2012 16:00:01 GMT
Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1226449&r1=1226448&r2=1226449&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Mon Jan  2 15:59:58 2012
@@ -1,5 +1,4 @@
 <?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
@@ -15,9 +14,7 @@
   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">
+--><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">
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
@@ -661,69 +658,69 @@
                 <phase>validate</phase>
                 <configuration>
                   <target>
-                    <path id="ecp.ws.path" location="${eclipse.workspace.dir}" />
-                    <property name="full.eclipse.workspace" refid="ecp.ws.path" />
-                    <path path="${basedir}/etc" id="etc.path" />
-
-                    <whichresource resource="/camel-eclipse-pmd" property="pmd.url" />
-                    <whichresource resource="/camel-pmd-ruleset.xml" property="pmdruleset.url"
/>
-                    <whichresource resource="/camel-eclipse-checkstyle" property="eclipse.checkstyle.url"
/>
-                    <whichresource resource="/camel-checkstyle.xml" property="checkstyle.url"
/>
-
-                    <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings"
/>
-                    <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core"
/>
-                    <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse"
/>
+                    <path id="ecp.ws.path" location="${eclipse.workspace.dir}"/>
+                    <property name="full.eclipse.workspace" refid="ecp.ws.path"/>
+                    <path path="${basedir}/etc" id="etc.path"/>
+
+                    <whichresource resource="/camel-eclipse-pmd" property="pmd.url"/>
+                    <whichresource resource="/camel-pmd-ruleset.xml" property="pmdruleset.url"/>
+                    <whichresource resource="/camel-eclipse-checkstyle" property="eclipse.checkstyle.url"/>
+                    <whichresource resource="/camel-checkstyle.xml" property="checkstyle.url"/>
+
+                    <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings"/>
+                    <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core"/>
+                    <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse"/>
 
-                    <get src="${checkstyle.url}" dest="${full.eclipse.workspace}/camel-checkstyle.xml"
/>
+                    <get src="${checkstyle.url}" dest="${full.eclipse.workspace}/camel-checkstyle.xml"/>
 
                     <!-- Add checkstyle config -->
                     <copy file="${basedir}/etc/eclipse/template.checkstyle-config.xml"
tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml"
overwrite="no">
                       <filterset>
-                        <filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/camel-checkstyle.xml"
/>
-                        <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt"
/>
+                        <filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/camel-checkstyle.xml"/>
+                        <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt"/>
                       </filterset>
                     </copy>
 
                     <xslt style="${basedir}/etc/eclipse/addcheckstyle.xsl" in="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml"
out="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new">
-                      <param name="checkstyleconfig" expression="${full.eclipse.workspace}/camel-checkstyle.xml"
/>
+                      <param name="checkstyleconfig" expression="${full.eclipse.workspace}/camel-checkstyle.xml"/>
                     </xslt>
-                    <copy file="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new"
tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml"
overwrite="yes" />
+                    <copy file="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new"
tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml"
overwrite="yes"/>
 
                     <!-- Add warning flags that we want -->
                     <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs">
-                      <entry key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion"
value="ignore" />
-                      <entry key="org.eclipse.jdt.core.compiler.problem.unusedImport"
value="ignore" />
-                      <entry key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface"
value="ignore" />
-                      <entry key="org.eclipse.jdt.core.compiler.problem.rawTypeReference"
value="ignore" />
+                      <entry key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion"
value="ignore"/>
+                      <entry key="org.eclipse.jdt.core.compiler.problem.unusedImport"
value="ignore"/>
+                      <entry key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface"
value="ignore"/>
+                      <entry key="org.eclipse.jdt.core.compiler.problem.rawTypeReference"
value="ignore"/>
                     </propertyfile>
 
                     <!-- Add code format rules -->
                     <concat destfile="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs"
append="true" fixlastline="true">
-                      <filelist dir="${basedir}/etc/eclipse" files="org.eclipse.jdt.core.prefs"
/>
+                      <filelist dir="${basedir}/etc/eclipse" files="org.eclipse.jdt.core.prefs"/>
                     </concat>
-                    <loadfile property="eclipse.code.format" srcFile="${basedir}/etc/eclipse/CamelCodeFormatter.xml"
/>
-                    <loadfile property="eclipse.code.templates" srcFile="${basedir}/etc/eclipse/codetemplates.xml"
/>
-                    <loadfile property="eclipse.camel.java.code.templates" srcFile="${basedir}/etc/eclipse/camel_java_templates.xml"
/>
-                    <loadfile property="eclipse.camel.xml.code.templates" srcFile="${basedir}/etc/eclipse/camel_xml_templates.xml"
/>  
+                    <loadfile property="eclipse.code.format" srcFile="${basedir}/etc/eclipse/CamelCodeFormatter.xml"/>
+                    <loadfile property="eclipse.code.templates" srcFile="${basedir}/etc/eclipse/codetemplates.xml"/>
+                    <loadfile property="eclipse.camel.java.code.templates" srcFile="${basedir}/etc/eclipse/camel_java_templates.xml"/>
+                    <loadfile property="eclipse.camel.xml.code.templates" srcFile="${basedir}/etc/eclipse/camel_xml_templates.xml"/>
 
                     <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
-                      <entry key="formatter_profile" value="Camel Java Conventions" />
-                      <entry key="org.eclipse.jdt.ui.formatterprofiles" value="${eclipse.code.format}"
/>
-                      <entry key="org.eclipse.jdt.ui.text.custom_code_templates" value="${eclipse.code.templates}"
/>
+                      <entry key="formatter_profile" value="Camel Java Conventions"/>
+                      <entry key="org.eclipse.jdt.ui.formatterprofiles" value="${eclipse.code.format}"/>
+                      <entry key="org.eclipse.jdt.ui.text.custom_code_templates" value="${eclipse.code.templates}"/>
                       
                       <!-- Add Camel templates for Java DSL -->
-                      <entry key="org.eclipse.jdt.ui.text.custom_templates" value="${eclipse.camel.java.code.templates}"
/>
+                      <entry key="org.eclipse.jdt.ui.text.custom_templates" value="${eclipse.camel.java.code.templates}"/>
 
                       <!-- Add import order -->
-                      <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;w3c;"
/>
+                      <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;w3c;"/>
                       <!-- Sort order -->
-                      <entry key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V,"
/>
-                      <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M," />
-                      <entry key="org.eclipse.jdt.ui.enable.visibility.order" value="true"
/>
+                      <entry key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V,"/>
+                      <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M,"/>
+                      <entry key="org.eclipse.jdt.ui.enable.visibility.order" value="true"/>
                     </propertyfile>
                     <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs">
-                      <entry key="eclipse.preferences.version" value="1" />
+                      <entry key="eclipse.preferences.version" value="1"/>
                        <!-- Add Camel templates for Spring DSL -->
-                      <entry key="org.eclipse.wst.sse.ui.custom_templates" value="${eclipse.camel.xml.code.templates}"
/> 
+                      <entry key="org.eclipse.wst.sse.ui.custom_templates" value="${eclipse.camel.xml.code.templates}"/>

                     </propertyfile>
                   </target>
                 </configuration>
@@ -872,7 +869,7 @@
           <releases>
             <enabled>false</enabled>
           </releases>
-          <snapshots />
+          <snapshots/>
           <id>Codehaus Snapshots</id>
           <url>http://snapshots.repository.codehaus.org/</url>
         </repository>
@@ -882,7 +879,7 @@
           <releases>
             <enabled>false</enabled>
           </releases>
-          <snapshots />
+          <snapshots/>
           <id>Codehaus Snapshots</id>
           <url>http://snapshots.repository.codehaus.org/</url>
         </pluginRepository>

Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
(from r1226435, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java&r1=1226435&r2=1226449&rev=1226449&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java
(original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
Mon Jan  2 15:59:58 2012
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-public class CamelMinaTest extends AbstractFeatureTest {
+public class CamelMina2Test extends AbstractFeatureTest {
 
-    public static final String COMPONENT = extractName(CamelMinaTest.class);
+    public static final String COMPONENT = extractName(CamelMina2Test.class);
 
     @Test
     public void test() throws Exception {



Mime
View raw message