You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2006/11/03 09:14:47 UTC
svn commit: r470714 - in
/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin: ./
src/main/java/org/apache/ws/jaxme/maven/plugins/ src/site/apt/
src/test/java/org/apache/ws/jaxme/maven/plugins/
Author: jochen
Date: Fri Nov 3 00:14:43 2006
New Revision: 470714
URL: http://svn.apache.org/viewvc?view=rev&rev=470714
Log:
- Fixed the SCM settings in the POM.
- Polished the parameter defaults to follow Maven 2 standards.
Modified:
webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/pom.xml
webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/ISchemaCollection.java
webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/JaxMeMojo.java
webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollection.java
webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollectionProcessor.java
webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/site/apt/properties.apt
webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/test/java/org/apache/ws/jaxme/maven/plugins/BaseTest.java
Modified: webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/pom.xml?view=diff&rev=470714&r1=470713&r2=470714
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/pom.xml (original)
+++ webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/pom.xml Fri Nov 3 00:14:43 2006
@@ -74,9 +74,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/jaxme/trunk/maven-jaxme-plugin/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/jaxme/trunk/maven-jaxme-plugin/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/webservices/jaxme/trunk/maven-jaxme-plugin/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
Modified: webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/ISchemaCollection.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/ISchemaCollection.java?view=diff&rev=470714&r1=470713&r2=470714
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/ISchemaCollection.java (original)
+++ webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/ISchemaCollection.java Fri Nov 3 00:14:43 2006
@@ -75,7 +75,7 @@
* before running the source generator.
* @parameter expression="false"
*/
- boolean isRemovingOldOutput();
+ boolean isRemoveOldOutput();
/**
* Specifies the schema reader being used. The default
@@ -101,12 +101,13 @@
/**
* The target directory for source files. Defaults to
+ * ${project.build.directory}/generated-sources/jaxme.
*/
String getSrcTarget();
/**
* The target directory for resource files. Defaults to
- * ${project.build.directory}/generated-sources/jaxme/resources.
+ * ${project.build.directory}/generated-resources/jaxme.
*/
String getResourceTarget();
Modified: webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/JaxMeMojo.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/JaxMeMojo.java?view=diff&rev=470714&r1=470713&r2=470714
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/JaxMeMojo.java (original)
+++ webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/JaxMeMojo.java Fri Nov 3 00:14:43 2006
@@ -73,13 +73,13 @@
* mode. Several vendor extensions are available, including
* some extensions, which are originally specified by the
* JAXB reference implementation.
- * @parameter expression="false"
+ * @parameter default-value="false"
*/
private boolean extension;
/** Setting this property to suppresses the builtin
* uptodate check.
- * @parameter expression="false"
+ * @parameter expression="${jaxme.forceCreation}" default-value="false"
*/
private boolean forceCreation;
@@ -111,7 +111,7 @@
/** Setting this property to true will make the generated
* files read-only.
- * @parameter expression="false"
+ * @parameter default-value="false"
*/
private boolean readOnly;
@@ -119,9 +119,9 @@
* produces "produces" elements are specified, then the plugin
* will remove all files matching the "produces" elements
* before running the source generator.
- * @parameter expression="false"
+ * @parameter default-value="false"
*/
- private boolean removingOldOutput;
+ private boolean removeOldOutput;
/** Sets the schema reader being used. The default
* schema reader is an instance of {@link JAXBSchemaReader}.
@@ -148,25 +148,25 @@
private String[] sgFactoryChains;
/** The target directory for source files. Defaults to
- * @parameter expression="${project.build.directory}/generated-sources/jaxme/java"
+ * @parameter expression="${project.build.directory}/generated-sources/jaxme"
*/
private String srcTarget;
/** The target directory for resource files. Defaults to
- * @parameter expression="${project.build.directory}/generated-sources/jaxme/resources"
+ * @parameter expression="${project.build.directory}/generated-resources/jaxme"
*/
private String resourceTarget;
/** Setting this property to true advices the plugin to use
* a validating XML parser for reading the schema files.
* By default, validation is disabled.
- * @parameter expression="false"
+ * @parameter default-value="false"
*/
private boolean validating;
/**
* Specifies additional sets of schema collections.
- * @parameter component="org.apache.ws.jaxme.maven.plugins.SchemaCollectionImpl"
+ * @parameter
*/
private SchemaCollection[] schemaCollections;
@@ -256,8 +256,8 @@
return readOnly;
}
- public boolean isRemovingOldOutput() {
- return removingOldOutput;
+ public boolean isRemoveOldOutput() {
+ return removeOldOutput;
}
public String getSchemaReader() {
@@ -329,10 +329,10 @@
private void configure(ISchemaCollection pCollection) {
if (isEmpty(pCollection.getSrcTarget())) {
- ((SchemaCollection) pCollection).setSrcTarget(new File(project.getBuild().getDirectory(), "generated-sources/jaxme/java").getPath());
+ ((SchemaCollection) pCollection).setSrcTarget(new File(project.getBuild().getDirectory(), "generated-sources/jaxme").getPath());
}
if (isEmpty(pCollection.getResourceTarget())) {
- ((SchemaCollection) pCollection).setResourceTarget(new File(project.getBuild().getDirectory(), "generated-sources/jaxme/resources").getPath());
+ ((SchemaCollection) pCollection).setResourceTarget(new File(project.getBuild().getDirectory(), "generated-resources/jaxme").getPath());
}
}
@@ -351,15 +351,7 @@
}
}
if (!found) {
- Artifact artifact = artifactFactory.createArtifactWithClassifier(pluginArtifact.getGroupId(),
- pluginArtifact.getArtifactId(), pluginArtifact.getVersion(),
- pluginArtifact.getType(), pluginArtifact.getClassifier());
- if ("jaxme2-rt".equals(artifact.getArtifactId())) {
- artifact.setScope(Artifact.SCOPE_RUNTIME);
- } else {
- artifact.setScope(Artifact.SCOPE_COMPILE);
- }
- projectArtifacts.add(artifact);
+ getLog().warn("No jaxme2 artifact is on your classpath. Please check your POM.");
}
}
}
Modified: webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollection.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollection.java?view=diff&rev=470714&r1=470713&r2=470714
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollection.java (original)
+++ webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollection.java Fri Nov 3 00:14:43 2006
@@ -29,7 +29,7 @@
private String[] sgFactoryChain;
private String packageName, srcTarget, resourceTarget, schemaReader;
private String schemaTargetPrefix;
- private boolean extension, removingOldOutput, validating;
+ private boolean extension, removeOldOutput, validating;
private Map properties;
private String entityResolverMode;
@@ -177,12 +177,12 @@
* before running the source generator.
* @parameter expression="false"
*/
- public void setRemovingOldOutput(boolean pRemovingOldOutput) {
- removingOldOutput = pRemovingOldOutput;
+ public void setRemoveOldOutput(boolean pRemoveOldOutput) {
+ removeOldOutput = pRemoveOldOutput;
}
- public boolean isRemovingOldOutput() {
- return removingOldOutput;
+ public boolean isRemoveOldOutput() {
+ return removeOldOutput;
}
/**
Modified: webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollectionProcessor.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollectionProcessor.java?view=diff&rev=470714&r1=470713&r2=470714
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollectionProcessor.java (original)
+++ webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/main/java/org/apache/ws/jaxme/maven/plugins/SchemaCollectionProcessor.java Fri Nov 3 00:14:43 2006
@@ -231,7 +231,7 @@
}
private void removeOldOutput(ISchemaCollection pCollection, FileSpec[] pProducedFiles) throws MojoExecutionException {
- if (pCollection.isRemovingOldOutput()) {
+ if (pCollection.isRemoveOldOutput()) {
for (int i = 0; i < pProducedFiles.length; i++) {
File f = pProducedFiles[i].getFile();
if (f.isFile() && !f.delete()) {
Modified: webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/site/apt/properties.apt
URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/site/apt/properties.apt?view=diff&rev=470714&r1=470713&r2=470714
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/site/apt/properties.apt (original)
+++ webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/site/apt/properties.apt Fri Nov 3 00:14:43 2006
@@ -98,15 +98,15 @@
| | Example: |
| | \<properties\>\<key\>value\</key\>\</properties\> |
*--------------------+---------------------------------------------------------------------------+
-| removingOldOutput | A boolean property, which specifies, whether generated files are being |
+| removeOldOutput | A boolean property, which specifies, whether generated files are being |
| | removed before invoking the generator. This is useful, if you have elder |
| | sources floating around, which are no longer compilable. On the other |
| | hand, a simple "mvn clean" will do the same trick, so you probably can do |
-| | very well without "removingOldOutput". |
+| | very well without "removeOldOutput". |
*--------------------+---------------------------------------------------------------------------+
| resourceTarget | Sets the target directory, in which generated resource files are being |
| | created. Defaults to |
-| | "${project.build.directory}/generated-sources/jaxme/resources". |
+| | "${project.build.directory}/generated-resources". |
*--------------------+---------------------------------------------------------------------------+
| schemaReader | By default, the generator will use an instance of |
| | org.apache.ws.jaxme.generator.sg.impl.JAXBSchemaReader for processing its |
@@ -136,7 +136,7 @@
*--------------------+---------------------------------------------------------------------------+
| srcTarget | Sets the target directory, in which generated Java sources are being |
| | created. Defaults to |
-| | "${project.build.directory}/generated-sources/jaxme/java". |
+| | "${project.build.directory}/generated-sources/jaxme". |
*--------------------+---------------------------------------------------------------------------+
| validating | By default, the XML schema files are being read with a non-validating |
| | parser. Setting this property to "true" turns on validation. |
Modified: webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/test/java/org/apache/ws/jaxme/maven/plugins/BaseTest.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/test/java/org/apache/ws/jaxme/maven/plugins/BaseTest.java?view=diff&rev=470714&r1=470713&r2=470714
==============================================================================
--- webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/test/java/org/apache/ws/jaxme/maven/plugins/BaseTest.java (original)
+++ webservices/jaxme/trunk/ws-jaxme/maven-jaxme-plugin/src/test/java/org/apache/ws/jaxme/maven/plugins/BaseTest.java Fri Nov 3 00:14:43 2006
@@ -46,8 +46,8 @@
};
project.setDependencyArtifacts(new HashSet());
setVariableValueToObject(mojo, "project", project);
- setVariableValueToObject(mojo, "srcTarget", "target/classes/generated-sources/jaxme/java");
- setVariableValueToObject(mojo, "resourceTarget", "target/classes/generated-sources/jaxme/resources");
+ setVariableValueToObject(mojo, "srcTarget", "target/classes/generated-sources/jaxme");
+ setVariableValueToObject(mojo, "resourceTarget", "target/classes/generated-resources/jaxme");
setVariableValueToObject(mojo, "classpathElements", new ArrayList());
setVariableValueToObject(mojo, "pluginArtifacts", new ArrayList());
ArtifactFactory factory = (ArtifactFactory) lookup(ArtifactFactory.class.getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org