Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #12 from porcelli/master

Fixed the problem of interface conflit by updated devkit to v0.7
  • Loading branch information...
commit 360c12f994e3cbbceb05d5135b2b45a3c8e050c9 2 parents b4615a9 + 5a58525
@3miliano 3miliano authored
Showing with 80 additions and 59 deletions.
  1. +1 −1  archetypes/cloud-connector/src/main/resources/archetype-resources/pom.xml
  2. +1 −1  archetypes/transformer/src/main/resources/archetype-resources/pom.xml
  3. +6 −26 core/annotations-processor/src/main/java/org/mule/devkit/ModulePlugin.java
  4. +1 −1  core/annotations-processor/src/main/java/org/mule/devkit/generation/dsl/DSLWrapperGenerator.java
  5. +1 −1  integration-tests/it/basic-integration-test/pom.xml
  6. +1 −1  integration-tests/it/bean-inject-integration-test/pom.xml
  7. +1 −1  integration-tests/it/collection-integration-test/pom.xml
  8. +1 −1  integration-tests/it/date-integration-test/pom.xml
  9. +2 −2 integration-tests/it/dsl-integration-test/pom.xml
  10. +1 −1  integration-tests/it/enum-integration-test/pom.xml
  11. +1 −1  integration-tests/it/http-callback-integration-test/pom.xml
  12. +1 −1  integration-tests/it/inbound-headers-integration-test/pom.xml
  13. +1 −1  integration-tests/it/intercepting-processor-integration-test/pom.xml
  14. +1 −1  integration-tests/it/invocation-headers-integration-test/pom.xml
  15. +1 −1  integration-tests/it/jaxb-integration-test/pom.xml
  16. +1 −1  integration-tests/it/lifecycle-integration-test/pom.xml
  17. +1 −1  integration-tests/it/named-config-integration-test/pom.xml
  18. +1 −1  integration-tests/it/nested-processor-integration-test/pom.xml
  19. +1 −1  integration-tests/it/oauth-integration-test/pom.xml
  20. +1 −1  integration-tests/it/oauth2-integration-test/pom.xml
  21. +1 −1  integration-tests/it/optional-integration-test/pom.xml
  22. +1 −1  integration-tests/it/outbound-headers-integration-test/pom.xml
  23. +1 −1  integration-tests/it/payload-integration-test/pom.xml
  24. +1 −1  integration-tests/it/pojo-integration-test/pom.xml
  25. +1 −1  integration-tests/it/pool-integration-test/pom.xml
  26. +1 −1  integration-tests/it/schema-location-integration-test/pom.xml
  27. +1 −1  integration-tests/it/session-integration-test/pom.xml
  28. +1 −1  integration-tests/it/source-integration-test/pom.xml
  29. +1 −1  integration-tests/it/transformer-integration-test/pom.xml
  30. +1 −4 integration-tests/pom.xml
  31. +44 −0 integration-tests/src/test/java/org/mule/devkit/it/DSLIT.java
View
2  archetypes/cloud-connector/src/main/resources/archetype-resources/pom.xml
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  archetypes/transformer/src/main/resources/archetype-resources/pom.xml
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
32 core/annotations-processor/src/main/java/org/mule/devkit/ModulePlugin.java
@@ -18,37 +18,17 @@
package org.mule.devkit;
import org.mule.devkit.generation.Generator;
-import org.mule.devkit.generation.adapter.CapabilitiesAdapterGenerator;
-import org.mule.devkit.generation.adapter.HttpCallbackAdapterGenerator;
-import org.mule.devkit.generation.adapter.LifecycleAdapterFactoryGenerator;
-import org.mule.devkit.generation.adapter.LifecycleAdapterGenerator;
-import org.mule.devkit.generation.adapter.OAuth1AdapterGenerator;
-import org.mule.devkit.generation.adapter.OAuth2AdapterGenerator;
-import org.mule.devkit.generation.adapter.PoolAdapterGenerator;
-import org.mule.devkit.generation.adapter.SessionManagerAdapterGenerator;
+import org.mule.devkit.generation.adapter.*;
import org.mule.devkit.generation.callback.HttpCallbackGenerator;
import org.mule.devkit.generation.callback.InterceptCallbackGenerator;
-import org.mule.devkit.generation.mule.MessageProcessorGenerator;
-import org.mule.devkit.generation.mule.MessageSourceGenerator;
-import org.mule.devkit.generation.mule.NestedProcessorChainGenerator;
-import org.mule.devkit.generation.mule.NestedProcessorStringGenerator;
-import org.mule.devkit.generation.mule.RegistryBootstrapGenerator;
+import org.mule.devkit.generation.dsl.DSLWrapperGenerator;
+import org.mule.devkit.generation.mule.*;
import org.mule.devkit.generation.mule.transfomer.EnumTransformerGenerator;
import org.mule.devkit.generation.mule.transfomer.JaxbTransformerGenerator;
import org.mule.devkit.generation.mule.transfomer.StringToDateTransformerGenerator;
import org.mule.devkit.generation.mule.transfomer.TransformerGenerator;
-import org.mule.devkit.generation.spring.BeanDefinitionParserGenerator;
-import org.mule.devkit.generation.spring.NamespaceHandlerGenerator;
-import org.mule.devkit.generation.spring.SchemaGenerator;
-import org.mule.devkit.generation.spring.SpringNamespaceHandlerGenerator;
-import org.mule.devkit.generation.spring.SpringSchemaGenerator;
-import org.mule.devkit.validation.BasicValidator;
-import org.mule.devkit.validation.OAuthValidator;
-import org.mule.devkit.validation.ProcessorValidator;
-import org.mule.devkit.validation.SessionValidator;
-import org.mule.devkit.validation.SourceValidator;
-import org.mule.devkit.validation.TransformerValidator;
-import org.mule.devkit.validation.Validator;
+import org.mule.devkit.generation.spring.*;
+import org.mule.devkit.validation.*;
import java.util.ArrayList;
import java.util.Collections;
@@ -85,7 +65,7 @@ public ModulePlugin() {
generators.add(new SpringNamespaceHandlerGenerator());
generators.add(new SpringSchemaGenerator());
generators.add(new RegistryBootstrapGenerator());
- //generators.add(new DSLWrapperGenerator());
+ generators.add(new DSLWrapperGenerator());
validators = new ArrayList<Validator>();
validators.add(new BasicValidator());
View
2  core/annotations-processor/src/main/java/org/mule/devkit/generation/dsl/DSLWrapperGenerator.java
@@ -284,7 +284,7 @@ private TypeReference messageProcessorDefinitionInterface() {
}
private TypeReference builderInterface() {
- return ref("org.mule.config.dsl.internal.Builder").boxify();
+ return ref("org.mule.config.dsl.internal.DSLBuilder").boxify();
}
private TypeReference expressionType() {
View
2  integration-tests/it/basic-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/bean-inject-integration-test/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/collection-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/date-integration-test/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
4 integration-tests/it/dsl-integration-test/pom.xml
@@ -72,12 +72,12 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
</dependency>
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-core</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
</dependency>
<dependency>
<groupId>org.mule</groupId>
View
2  integration-tests/it/enum-integration-test/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/http-callback-integration-test/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/inbound-headers-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/intercepting-processor-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/invocation-headers-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/jaxb-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/lifecycle-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/named-config-integration-test/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/nested-processor-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
</dependency>
<dependency>
<groupId>org.mule</groupId>
View
2  integration-tests/it/oauth-integration-test/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/oauth2-integration-test/pom.xml
@@ -13,7 +13,7 @@
<!--<devkit.version>3.0-SNAPSHOT</devkit.version>-->
<mule.version>3.2.0</mule.version>
<devkit.version>3.0-SNAPSHOT</devkit.version>
- <dsl.version>0.7-SNAPSHOT</dsl.version>
+ <dsl.version>0.7</dsl.version>
</properties>
<build>
View
2  integration-tests/it/optional-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/outbound-headers-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/payload-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/pojo-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/pool-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/schema-location-integration-test/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/session-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/source-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
2  integration-tests/it/transformer-integration-test/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
5 integration-tests/pom.xml
@@ -98,9 +98,6 @@
<systemPropertyVariables>
<archetypeVersion>${project.version}</archetypeVersion>
</systemPropertyVariables>
- <excludes>
- <exclude>**/DSLIT</exclude>
- </excludes>
</configuration>
<executions>
<execution>
@@ -159,7 +156,7 @@
<dependency>
<groupId>org.mule.dsl</groupId>
<artifactId>dsl-api</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7</version>
<exclusions>
<exclusion>
<groupId>org.mule</groupId>
View
44 integration-tests/src/test/java/org/mule/devkit/it/DSLIT.java
@@ -0,0 +1,44 @@
+/**
+ * Mule Development Kit
+ * Copyright 2010-2011 (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
+ *
+ * Licensed 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.mule.devkit.it;
+
+import java.io.File;
+
+public class DSLIT extends AbstractMavenIT
+{
+
+ protected String getArtifactVersion()
+ {
+ return "1.0";
+ }
+
+ protected String getArtifactId()
+ {
+ return "dsl-integration-test";
+ }
+
+ protected String getGroupId()
+ {
+ return "org.mule.devkit.it";
+ }
+
+ protected File getRoot()
+ {
+ return new File("target/integration-tests/" + getArtifactId());
+ }
+}
Please sign in to comment.
Something went wrong with that request. Please try again.