You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/04/03 11:00:27 UTC
camel git commit: CAMEL-9758: Remove releasing
xxxComponent.properties to Maven
Repository: camel
Updated Branches:
refs/heads/master 12abfb0de -> 0e0496f59
CAMEL-9758: Remove releasing xxxComponent.properties to Maven
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0e0496f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0e0496f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0e0496f5
Branch: refs/heads/master
Commit: 0e0496f59da039df11c7fe24aa88df57c5a7ce16
Parents: 12abfb0
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Apr 3 10:56:35 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Apr 3 10:56:35 2016 +0200
----------------------------------------------------------------------
.../maven/packaging/PackageComponentMojo.java | 3 -
.../maven/packaging/PackageDataFormatMojo.java | 89 +++++++++----------
.../maven/packaging/PackageLanguageMojo.java | 91 +++++++++-----------
.../camel/maven/packaging/PackageModelMojo.java | 7 --
4 files changed, 85 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0e0496f5/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index a51601c..e249685 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
@@ -170,9 +170,6 @@ public class PackageComponentMojo extends AbstractMojo {
log.info("Generated " + outFile + " containing " + count + " Camel " + (count > 1 ? "components: " : "component: ") + names);
- if (projectHelper != null) {
- projectHelper.attachArtifact(project, "properties", "camelComponent", outFile);
- }
} catch (IOException e) {
throw new MojoExecutionException("Failed to write properties to " + outFile + ". Reason: " + e, e);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/0e0496f5/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 9f88702..6edae6f 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -81,7 +81,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
* @readonly
*/
private MavenProjectHelper projectHelper;
-
+
/**
* build context to check changed files and mark them for refresh (used for
* m2e compatibility)
@@ -165,55 +165,53 @@ public class PackageDataFormatMojo extends AbstractMojo {
is = new FileInputStream(new File(core, "org/apache/camel/model/dataformat/" + modelName + ".json"));
}
String json = loadText(is);
- if (json != null) {
- DataFormatModel dataFormatModel = new DataFormatModel();
- dataFormatModel.setName(name);
- dataFormatModel.setTitle("");
- dataFormatModel.setModelName(modelName);
- dataFormatModel.setLabel("");
- dataFormatModel.setDescription(project.getDescription());
- dataFormatModel.setJavaType(javaType);
- dataFormatModel.setGroupId(project.getGroupId());
- dataFormatModel.setArtifactId(project.getArtifactId());
- dataFormatModel.setVersion(project.getVersion());
-
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("title")) {
- String title = row.get("title");
- dataFormatModel.setTitle(asModelTitle(name, title));
- }
- if (row.containsKey("label")) {
- dataFormatModel.setLabel(row.get("label"));
- }
- if (row.containsKey("javaType")) {
- dataFormatModel.setModelJavaType(row.get("javaType"));
- }
- // override description for camel-core, as otherwise its too generic
- if ("camel-core".equals(project.getArtifactId())) {
- if (row.containsKey("description")) {
- dataFormatModel.setLabel(row.get("description"));
- }
+ DataFormatModel dataFormatModel = new DataFormatModel();
+ dataFormatModel.setName(name);
+ dataFormatModel.setTitle("");
+ dataFormatModel.setModelName(modelName);
+ dataFormatModel.setLabel("");
+ dataFormatModel.setDescription(project.getDescription());
+ dataFormatModel.setJavaType(javaType);
+ dataFormatModel.setGroupId(project.getGroupId());
+ dataFormatModel.setArtifactId(project.getArtifactId());
+ dataFormatModel.setVersion(project.getVersion());
+
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("title")) {
+ String title = row.get("title");
+ dataFormatModel.setTitle(asModelTitle(name, title));
+ }
+ if (row.containsKey("label")) {
+ dataFormatModel.setLabel(row.get("label"));
+ }
+ if (row.containsKey("javaType")) {
+ dataFormatModel.setModelJavaType(row.get("javaType"));
+ }
+ // override description for camel-core, as otherwise its too generic
+ if ("camel-core".equals(project.getArtifactId())) {
+ if (row.containsKey("description")) {
+ dataFormatModel.setLabel(row.get("description"));
}
}
- log.debug("Model " + dataFormatModel);
+ }
+ log.debug("Model " + dataFormatModel);
- // build json schema for the data format
- String properties = after(json, " \"properties\": {");
- String schema = createParameterJsonSchema(dataFormatModel, properties);
- log.debug("JSon schema\n" + schema);
+ // build json schema for the data format
+ String properties = after(json, " \"properties\": {");
+ String schema = createParameterJsonSchema(dataFormatModel, properties);
+ log.debug("JSon schema\n" + schema);
- // write this to the directory
- File dir = new File(schemaOutDir, schemaSubDirectory(dataFormatModel.getJavaType()));
- dir.mkdirs();
+ // write this to the directory
+ File dir = new File(schemaOutDir, schemaSubDirectory(dataFormatModel.getJavaType()));
+ dir.mkdirs();
- File out = new File(dir, name + ".json");
- OutputStream fos = buildContext.newFileOutputStream(out);
- fos.write(schema.getBytes());
- fos.close();
+ File out = new File(dir, name + ".json");
+ OutputStream fos = buildContext.newFileOutputStream(out);
+ fos.write(schema.getBytes());
+ fos.close();
- log.debug("Generated " + out + " containing JSon schema for " + name + " data format");
- }
+ log.debug("Generated " + out + " containing JSon schema for " + name + " data format");
}
}
}
@@ -264,9 +262,6 @@ public class PackageDataFormatMojo extends AbstractMojo {
log.info("Generated " + outFile + " containing " + count + " Camel " + (count > 1 ? "dataformats: " : "dataformat: ") + names);
- if (projectHelper != null) {
- projectHelper.attachArtifact(project, "properties", "camelDataFormat", outFile);
- }
} catch (IOException e) {
throw new MojoExecutionException("Failed to write properties to " + outFile + ". Reason: " + e, e);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/0e0496f5/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index 070188a..aa244a3 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -165,57 +165,55 @@ public class PackageLanguageMojo extends AbstractMojo {
is = new FileInputStream(new File(core, "org/apache/camel/model/language/" + modelName + ".json"));
}
String json = loadText(is);
- if (json != null) {
- LanguageModel languageModel = new LanguageModel();
- languageModel.setName(name);
- languageModel.setTitle("");
- languageModel.setModelName(modelName);
- languageModel.setLabel("");
- languageModel.setDescription("");
- languageModel.setJavaType(javaType);
- languageModel.setGroupId(project.getGroupId());
- languageModel.setArtifactId(project.getArtifactId());
- languageModel.setVersion(project.getVersion());
-
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("title")) {
- // title may be special for some languages
- String title = asTitle(name, row.get("title"));
- languageModel.setTitle(title);
- }
- if (row.containsKey("description")) {
- // description may be special for some languages
- String desc = asDescription(name, row.get("description"));
- languageModel.setDescription(desc);
- }
- if (row.containsKey("label")) {
- languageModel.setLabel(row.get("label"));
- }
- if (row.containsKey("javaType")) {
- languageModel.setModelJavaType(row.get("javaType"));
- }
+ LanguageModel languageModel = new LanguageModel();
+ languageModel.setName(name);
+ languageModel.setTitle("");
+ languageModel.setModelName(modelName);
+ languageModel.setLabel("");
+ languageModel.setDescription("");
+ languageModel.setJavaType(javaType);
+ languageModel.setGroupId(project.getGroupId());
+ languageModel.setArtifactId(project.getArtifactId());
+ languageModel.setVersion(project.getVersion());
+
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("title")) {
+ // title may be special for some languages
+ String title = asTitle(name, row.get("title"));
+ languageModel.setTitle(title);
}
- log.debug("Model " + languageModel);
+ if (row.containsKey("description")) {
+ // description may be special for some languages
+ String desc = asDescription(name, row.get("description"));
+ languageModel.setDescription(desc);
+ }
+ if (row.containsKey("label")) {
+ languageModel.setLabel(row.get("label"));
+ }
+ if (row.containsKey("javaType")) {
+ languageModel.setModelJavaType(row.get("javaType"));
+ }
+ }
+ log.debug("Model " + languageModel);
- // build json schema for the data format
- String properties = after(json, " \"properties\": {");
- String schema = createParameterJsonSchema(languageModel, properties);
- log.debug("JSon schema\n" + schema);
+ // build json schema for the data format
+ String properties = after(json, " \"properties\": {");
+ String schema = createParameterJsonSchema(languageModel, properties);
+ log.debug("JSon schema\n" + schema);
- // write this to the directory
- File dir = new File(schemaOutDir, schemaSubDirectory(languageModel.getJavaType()));
- dir.mkdirs();
+ // write this to the directory
+ File dir = new File(schemaOutDir, schemaSubDirectory(languageModel.getJavaType()));
+ dir.mkdirs();
- File out = new File(dir, name + ".json");
- OutputStream fos = buildContext.newFileOutputStream(out);
- fos.write(schema.getBytes());
- fos.close();
+ File out = new File(dir, name + ".json");
+ OutputStream fos = buildContext.newFileOutputStream(out);
+ fos.write(schema.getBytes());
+ fos.close();
- buildContext.refresh(out);
+ buildContext.refresh(out);
- log.debug("Generated " + out + " containing JSon schema for " + name + " language");
- }
+ log.debug("Generated " + out + " containing JSon schema for " + name + " language");
}
}
}
@@ -266,9 +264,6 @@ public class PackageLanguageMojo extends AbstractMojo {
log.info("Generated " + outFile + " containing " + count + " Camel " + (count > 1 ? "languages: " : "language: ") + names);
- if (projectHelper != null) {
- projectHelper.attachArtifact(project, "properties", "camelLanguage", outFile);
- }
} catch (IOException e) {
throw new MojoExecutionException("Failed to write properties to " + outFile + ". Reason: " + e, e);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/0e0496f5/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
index b33c000..f39a8ee 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
@@ -117,13 +117,6 @@ public class PackageModelMojo extends AbstractMojo {
getLog().info("Generated " + outFile + " containing " + models.size() + " Camel models");
- if (projectHelper != null) {
- List<String> includes = new ArrayList<String>();
- includes.add("**/model.properties");
- projectHelper.addResource(this.project, outDir.getPath(), includes, new ArrayList<String>());
- projectHelper.attachArtifact(this.project, "properties", "camelModel", outFile);
- }
-
} catch (IOException e) {
throw new MojoFailureException("Error writing to file " + outFile);
}