You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:24 UTC
[19/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java
index 7d7dfcf..d90226c 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java
@@ -63,7 +63,7 @@ public class Option {
public void setPrefix(String prefix) {
this.prefix = prefix;
}
-
+
}
/**
@@ -71,7 +71,7 @@ public class Option {
*/
UriPrefixPair[] packagePrefixes;
/**
- * OASIS catalog file for use when reading the WSDL.
+ * OASIS catalog file for use when reading the WSDL.
*/
File catalog;
/**
@@ -79,7 +79,7 @@ public class Option {
*/
File output;
/**
- * Whether to validate the WSDL.
+ * Whether to validate the WSDL.
*/
String validate;
/**
@@ -87,14 +87,14 @@ public class Option {
*/
String wsdlVersion;
/**
- * A set of dependent files used to detect that the generator must process WSDL, even
+ * A set of dependent files used to detect that the generator must process WSDL, even
* if generator marker files are up to date.
*/
File dependencies[];
public Option() {
}
-
+
public void merge(Option other) {
if (catalog == null) {
catalog = other.getCatalog();
@@ -141,7 +141,7 @@ public class Option {
}
/**
- * @return output directory. Default is set
+ * @return output directory. Default is set
* at the plugin level.
*/
public File getOutput() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
index 6ce9798..458aa09 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
@@ -64,17 +64,17 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
*/
@Parameter
Option defaultOptions = new Option();
-
+
/**
- * Options that specify WSDLs to process and/or control the processing of wsdls.
+ * Options that specify WSDLs to process and/or control the processing of wsdls.
* If you have enabled wsdl scanning, these elements attach options to particular wsdls.
- * If you have not enabled wsdl scanning, these options call out the wsdls to process.
+ * If you have not enabled wsdl scanning, these options call out the wsdls to process.
*/
@Parameter
WsdlOption wsdlOptions[];
@Override
- protected Bus generate(GenericWsdlOption genericWsdlOption,
+ protected Bus generate(GenericWsdlOption genericWsdlOption,
Bus bus, Set<URI> classPath)
throws MojoExecutionException {
@@ -188,7 +188,7 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
}
protected void mergeOptions(List<GenericWsdlOption> effectiveWsdlOptions) {
- File outputDirFile = getGeneratedTestRoot() == null
+ File outputDirFile = getGeneratedTestRoot() == null
? getGeneratedSourceRoot() : getGeneratedTestRoot();
for (GenericWsdlOption wo : effectiveWsdlOptions) {
WsdlOption option = (WsdlOption)wo;
@@ -204,13 +204,13 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
throws MojoExecutionException {
List<GenericWsdlOption> effectiveWsdlOptions = new ArrayList<>();
List<GenericWsdlOption> temp;
-
+
if (wsdlOptions != null) {
for (WsdlOption wo : wsdlOptions) {
effectiveWsdlOptions.add(wo);
}
}
-
+
if (wsdlRoot != null && wsdlRoot.exists() && !disableDirectoryScan) {
temp = loadWsdlOptionsFromFiles(wsdlRoot, getGeneratedSourceRoot());
effectiveWsdlOptions.addAll(temp);
@@ -253,7 +253,7 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
public static List<GenericWsdlOption> loadWsdlOptionsFromDependencies(MavenProject project,
Option defaultOptions,
File outputDir) {
- List<GenericWsdlOption> options
+ List<GenericWsdlOption> options
= new ArrayList<>();
Set<Artifact> dependencies = CastUtils.cast(project.getDependencyArtifacts());
for (Artifact artifact : dependencies) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java
index cd11f8c..9ab6fb7 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java
@@ -30,17 +30,17 @@ import org.apache.cxf.maven_plugin.WsdlArtifact;
* An option for javascript generation.
*/
public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.GenericWsdlOption {
-
+
private String wsdl;
private WsdlArtifact artifact;
-
+
/**
* @return Pathname or URI to wsdl.
*/
public String getWsdl() {
return wsdl;
}
-
+
/**
* Set pathname or URI to WSDL.
* @param wsdl path.
@@ -48,9 +48,9 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
public void setWsdl(String wsdl) {
this.wsdl = wsdl;
}
-
+
/**
- * Maven coordinates
+ * Maven coordinates
* @return
*/
public WsdlArtifact getArtifact() {
@@ -91,7 +91,7 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
options.add("-catalog");
options.add(catalog.getAbsolutePath());
}
-
+
options.add("-d");
if (output != null) {
options.add(output.getAbsolutePath());
@@ -117,5 +117,5 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
public String toString() {
return String.format("WsdlOption [wsdl=%s, artifact=%s, %s]", wsdl, artifact,
super.toString());
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
index 9fa6fe8..9cd29db 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
@@ -41,7 +41,7 @@ public class IDLToWSDLPlugin extends AbstractMojo {
* @required
*/
String outputDir;
-
+
/**
* @parameter
*/
@@ -51,7 +51,7 @@ public class IDLToWSDLPlugin extends AbstractMojo {
public void execute() throws MojoExecutionException {
File outputDirFile = new File(outputDir);
outputDirFile.mkdirs();
-
+
if (idltowsdlOptions == null) {
throw new MojoExecutionException("Please specify the idl2wsdl options");
}
@@ -72,7 +72,7 @@ public class IDLToWSDLPlugin extends AbstractMojo {
list.add("-o");
list.add(outputDir);
list.addAll(idltowsdlOptions[x].getExtraargs());
- list.add(idltowsdlOptions[x].getIDL());
+ list.add(idltowsdlOptions[x].getIDL());
try {
IDLToWSDL.run(list.toArray(new String[list.size()]));
doneFile.delete();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
index 96f5996..af9f47e 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
@@ -25,7 +25,7 @@ public class IdltowsdlOption {
String idl;
List<String> extraargs;
-
+
public String getIDL() {
return idl;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
index cab9898..49cc277 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
@@ -50,18 +50,18 @@ public class WSDLToIDLPlugin extends AbstractMojo {
* @required
*/
File outputDir;
-
+
/**
* @parameter
*/
WsdltoidlOption wsdltoidlOptions[];
-
+
/**
* @parameter expression="${project}"
* @required
*/
MavenProject project;
-
+
/**
* Use the compile classpath rather than the test classpath for execution
* useful if the test dependencies clash with those of wsdl2java
@@ -81,7 +81,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
}
outputDir.mkdirs();
-
+
List<URL> urlList = new ArrayList<>();
StringBuilder buf = new StringBuilder();
@@ -110,34 +110,34 @@ public class WSDLToIDLPlugin extends AbstractMojo {
//ignore
}
}
-
+
ClassLoader origContext = Thread.currentThread().getContextClassLoader();
ClassLoader loader = ClassLoaderUtils.getURLClassLoader(urlList, origContext);
String newCp = buf.toString();
//with some VM's, creating an XML parser (which we will do to parse wsdls)
- //will set some system properties that then interferes with mavens
+ //will set some system properties that then interferes with mavens
//dependency resolution. (OSX is the major culprit here)
//We'll save the props and then set them back later.
Map<Object, Object> origProps = new HashMap<Object, Object>(System.getProperties());
-
+
String cp = System.getProperty("java.class.path");
-
+
try {
Thread.currentThread().setContextClassLoader(loader);
System.setProperty("java.class.path", newCp);
-
+
for (int x = 0; x < wsdltoidlOptions.length; x++) {
File file = new File(wsdltoidlOptions[x].getWSDL());
File doneFile = new File(outputDir, "." + file.getName() + ".DONE");
-
+
boolean doWork = file.lastModified() > doneFile.lastModified();
if (!doneFile.exists()) {
doWork = true;
} else if (file.lastModified() > doneFile.lastModified()) {
doWork = true;
}
-
+
if (doWork) {
List<String> list = new ArrayList<>();
list.add("-d");
@@ -151,7 +151,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
if (wsdltoidlOptions[x].getExtraargs() != null) {
list.addAll(wsdltoidlOptions[x].getExtraargs());
}
- list.add(wsdltoidlOptions[x].getWSDL());
+ list.add(wsdltoidlOptions[x].getWSDL());
try {
WSDLToIDL.run(list.toArray(new String[list.size()]));
doneFile.delete();
@@ -172,7 +172,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
if (cp != null) {
System.setProperty("java.class.path", cp);
}
-
+
Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties());
for (Object o : newProps.keySet()) {
if (!origProps.containsKey(o)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
index 6c52bea..4355b64 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
@@ -28,7 +28,7 @@ public class WsdltoidlOption {
boolean idl;
List<String> extraargs;
-
+
public String getWSDL() {
return wsdl;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
index 23c40b5..f37a06a 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
@@ -31,11 +31,11 @@ import com.sun.javadoc.RootDoc;
import com.sun.javadoc.Tag;
public final class DumpJavaDoc {
-
+
private DumpJavaDoc() {
-
+
}
-
+
public static boolean start(RootDoc root) throws IOException {
String dumpFileName = readOptions(root.options());
FileOutputStream fos = new FileOutputStream(dumpFileName);
@@ -48,7 +48,7 @@ public final class DumpJavaDoc {
Parameter[] parameters = method.parameters();
for (int i = 0; i < parameters.length; ++i) {
if (parameters[i].name().equals(paramTag.parameterName())) {
- javaDocMap.put(method.qualifiedName() + ".paramCommentTag." + i,
+ javaDocMap.put(method.qualifiedName() + ".paramCommentTag." + i,
paramTag.parameterComment());
}
}
@@ -56,18 +56,18 @@ public final class DumpJavaDoc {
Tag retTags[] = method.tags("return");
if (retTags != null && retTags.length == 1) {
Tag retTag = method.tags("return")[0];
- javaDocMap.put(method.qualifiedName() + "." + "returnCommentTag",
+ javaDocMap.put(method.qualifiedName() + "." + "returnCommentTag",
retTag.text());
}
}
-
+
}
javaDocMap.store(fos, "");
fos.flush();
fos.close();
return true;
}
-
+
private static String readOptions(String[][] options) {
String tagName = null;
for (int i = 0; i < options.length; i++) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
index b1b14e9..9aa858e 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
@@ -54,32 +54,32 @@ import org.apache.maven.project.MavenProjectHelper;
* @threadSafe
*/
public class Java2WADLMojo extends AbstractMojo {
-
+
public static final String WADL_NS = "http://wadl.dev.java.net/2009/02";
-
-
-
+
+
+
private List<ClassResourceInfo> classResourceInfos = new ArrayList<>();
-
-
+
+
/**
* @parameter
*/
private String outputFile;
-
-
+
+
/**
* @parameter
*/
private String address;
-
+
/**
* @parameter
*/
private String docProvider;
-
-
+
+
/**
* Attach the generated wadl file to the list of files to be deployed
* on install. This means the wadl file will be copied to the repository
@@ -90,8 +90,8 @@ public class Java2WADLMojo extends AbstractMojo {
* @parameter default-value="true"
*/
private Boolean attachWadl;
-
-
+
+
/**
* @parameter
*/
@@ -102,19 +102,19 @@ public class Java2WADLMojo extends AbstractMojo {
* @required
*/
private List<String> classResourceNames;
-
+
/**
* @parameter
*/
private String basePackages;
-
+
/**
* @parameter expression="${project}"
* @required
*/
private MavenProject project;
-
-
+
+
/**
* Maven ProjectHelper.
*
@@ -133,42 +133,42 @@ public class Java2WADLMojo extends AbstractMojo {
* @parameter default-value="true"
*/
private boolean incrementNamespacePrefix;
-
+
/**
* @parameter default-value="true"
*/
private boolean singleResourceMultipleMethods;
-
+
/**
* @parameter default-value="false"
*/
private boolean useSingleSlashResource;
-
+
/**
* @parameter default-value="false"
*/
private boolean includeDefaultWadlSchemaLocation;
-
+
/**
* @parameter default-value="false"
*/
private boolean ignoreForwardSlash;
-
+
/**
* @parameter default-value="false"
*/
private boolean addResourceAndMethodIds;
-
+
/**
* @parameter default-value="false"
*/
private boolean linkAnyMediaTypeToXmlSchema;
-
+
/**
* @parameter default-value="false"
*/
private boolean checkAbsolutePathSlash;
-
+
/**
* @parameter default-value="false"
*/
@@ -179,12 +179,12 @@ public class Java2WADLMojo extends AbstractMojo {
*/
private boolean useJaxbContextForQnames;
-
+
/**
* @parameter default-value="true"
*/
private boolean usePathParamsToCompareOperations;
-
+
/**
* @parameter default-value="true"
*/
@@ -199,34 +199,34 @@ public class Java2WADLMojo extends AbstractMojo {
* @parameter default-value="true"
*/
private boolean supportJaxbSubstitutions;
-
+
/**
* @parameter
*/
private String applicationTitle;
-
+
/**
* @parameter
*/
private String namespacePrefix;
-
+
/**
- * @parameter
+ * @parameter
*/
private String outputFileName;
-
+
/**
* @parameter default-value="wadl"
*/
private String outputFileExtension;
-
+
/**
* @parameter
*/
private String stylesheetReference;
-
+
private ClassLoader resourceClassLoader;
-
+
public void execute() throws MojoExecutionException {
List<Class<?>> resourceClasses = loadResourceClasses();
initClassResourceInfoList(resourceClasses);
@@ -243,12 +243,12 @@ public class Java2WADLMojo extends AbstractMojo {
}
}
setExtraProperties(wadlGenerator);
-
+
StringBuilder sbMain = wadlGenerator.generateWADL(getBaseURI(), classResourceInfos, useJson, null, null);
getLog().debug("the wadl is =====> \n" + sbMain.toString());
generateWadl(resourceClasses, sbMain.toString());
}
-
+
private void setExtraProperties(WadlGenerator wg) {
wg.setSingleResourceMultipleMethods(singleResourceMultipleMethods);
wg.setIncrementNamespacePrefix(incrementNamespacePrefix);
@@ -266,18 +266,18 @@ public class Java2WADLMojo extends AbstractMojo {
wg.setSupportJaxbSubstitutions(supportJaxbSubstitutions);
if (applicationTitle != null) {
wg.setApplicationTitle(applicationTitle);
- }
+ }
if (namespacePrefix != null) {
wg.setNamespacePrefix(namespacePrefix);
}
wg.setStylesheetReference(stylesheetReference);
}
-
+
private void generateWadl(List<Class<?>> resourceClasses, String wadl) throws MojoExecutionException {
-
+
if (outputFile == null && project != null) {
// Put the wadl in target/generated/wadl
-
+
String name = null;
if (outputFileName != null) {
name = outputFileName;
@@ -286,10 +286,10 @@ public class Java2WADLMojo extends AbstractMojo {
} else {
name = "application";
}
- outputFile = (project.getBuild().getDirectory() + "/generated/wadl/" + name + "."
+ outputFile = (project.getBuild().getDirectory() + "/generated/wadl/" + name + "."
+ outputFileExtension).replace("/", File.separator);
}
-
+
BufferedWriter writer = null;
try {
FileUtils.mkDir(new File(outputFile).getParentFile());
@@ -321,7 +321,7 @@ public class Java2WADLMojo extends AbstractMojo {
} else {
projectHelper.attachArtifact(project, "wadl", wadlFile);
}
-
+
}
}
}
@@ -330,13 +330,13 @@ public class Java2WADLMojo extends AbstractMojo {
if (address != null) {
return address;
} else {
- // the consumer may use the original target URI to figure out absolute URI
+ // the consumer may use the original target URI to figure out absolute URI
return "/";
}
}
-
-
+
+
private ClassLoader getClassLoader() throws MojoExecutionException {
if (resourceClassLoader == null) {
try {
@@ -361,14 +361,14 @@ public class Java2WADLMojo extends AbstractMojo {
resourceClasses.add(getClassLoader().loadClass(className));
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage(), e);
- }
+ }
}
if (resourceClasses.isEmpty() && basePackages != null) {
try {
List<Class<? extends Annotation>> anns = new ArrayList<Class<? extends Annotation>>();
anns.add(Path.class);
- final Map< Class< ? extends Annotation >, Collection< Class< ? > > > discoveredClasses =
- ClasspathScanner.findClasses(ClasspathScanner.parsePackages(basePackages),
+ final Map< Class< ? extends Annotation >, Collection< Class< ? > > > discoveredClasses =
+ ClasspathScanner.findClasses(ClasspathScanner.parsePackages(basePackages),
anns,
getClassLoader());
if (discoveredClasses.containsKey(Path.class)) {
@@ -380,7 +380,7 @@ public class Java2WADLMojo extends AbstractMojo {
}
return resourceClasses;
}
-
+
private void initClassResourceInfoList(List<Class<?>> resourceClasses) throws MojoExecutionException {
for (Class<?> beanClass : resourceClasses) {
ClassResourceInfo cri = getCreatedFromModel(beanClass);
@@ -392,7 +392,7 @@ public class Java2WADLMojo extends AbstractMojo {
cri.setResourceClass(beanClass);
continue;
}
-
+
cri = ResourceUtils.createClassResourceInfo(beanClass, beanClass, true, true,
getBus());
if (cri != null) {
@@ -400,15 +400,15 @@ public class Java2WADLMojo extends AbstractMojo {
}
}
}
-
+
private Bus getBus() {
return BusFactory.getDefaultBus();
}
private ClassResourceInfo getCreatedFromModel(Class<?> realClass) {
-
+
for (ClassResourceInfo cri : classResourceInfos) {
- if (cri.isCreatedFromModel()
+ if (cri.isCreatedFromModel()
&& cri.isRoot() && cri.getServiceClass().isAssignableFrom(realClass)) {
return cri;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
index c7e1ef1..26435f2 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
@@ -47,11 +47,11 @@ public class ParseJavaDocMojo extends AbstractMojo {
/**
* The source encoding.
- *
+ *
* @parameter defaultValue = "${project.build.sourceEncoding}"
*/
private String encoding;
-
+
/**
* @parameter expression="${project}"
* @required
@@ -99,7 +99,7 @@ public class ParseJavaDocMojo extends AbstractMojo {
/**
* The local maven repository.
- *
+ *
* @parameter expression="${localRepository}"
* @required
* @readonly
@@ -108,14 +108,14 @@ public class ParseJavaDocMojo extends AbstractMojo {
/**
* The remote repositories where artifacts are located.
- *
+ *
* @parameter expression="${project.remoteArtifactRepositories}"
* @required
* @readonly
*/
private List<ArtifactRepository> remoteRepositories;
-
-
+
+
/**
* Directory into which assembled {@link JavadocOptions} instances will be written before they
* are added to javadoc resources bundles.
@@ -137,11 +137,11 @@ public class ParseJavaDocMojo extends AbstractMojo {
f = AbstractJavadocMojo.class.getDeclaredField("encoding");
f.setAccessible(true);
f.set(mojo, encoding);
-
+
f = AbstractJavadocMojo.class.getDeclaredField("stylesheet");
f.setAccessible(true);
f.set(mojo, "stylesheet");
-
+
f = AbstractJavadocMojo.class.getDeclaredField("javadocOptionsDir");
f.setAccessible(true);
f.set(mojo, javadocOptionsDir);
@@ -196,26 +196,26 @@ public class ParseJavaDocMojo extends AbstractMojo {
f = AbstractJavadocMojo.class.getDeclaredField("applyJavadocSecurityFix");
f.setAccessible(true);
f.set(mojo, false);
-
+
f = AbstractJavadocMojo.class.getDeclaredField("additionalparam");
f.setAccessible(true);
- f.set(mojo, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
+ f.set(mojo, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
+ File.separator + "dumpFile.properties");
f = AbstractJavadocMojo.class.getDeclaredField("useStandardDocletOptions");
f.setAccessible(true);
f.set(mojo, false);
-
+
f = AbstractJavadocMojo.class.getDeclaredField("project");
f.setAccessible(true);
f.set(mojo, mavenProject);
-
+
if (dumpFileOutputDirectory != null) {
f = AbstractJavadocMojo.class.getDeclaredField("outputDirectory");
f.setAccessible(true);
f.set(mojo, dumpFileOutputDirectory);
}
-
+
Method m = AbstractJavadocMojo.class.getDeclaredMethod("executeReport", Locale.class);
m.setAccessible(true);
m.invoke(mojo, locale);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java
index f5fcb12..abe5c90 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java
@@ -31,11 +31,11 @@ import org.apache.cxf.jaxrs.model.OperationResourceInfo;
import org.apache.cxf.jaxrs.model.doc.DocumentationProvider;
public class ResourceMapJavaDocProvider implements DocumentationProvider {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(ResourceMapJavaDocProvider.class);
-
+
private Properties dumpedDocFile;
-
+
public ResourceMapJavaDocProvider(String targetFolder) {
dumpedDocFile = new Properties();
try (FileInputStream fis = new FileInputStream(targetFolder + "/site/apidocs/dumpFile.properties")) {
@@ -53,34 +53,34 @@ public class ResourceMapJavaDocProvider implements DocumentationProvider {
@Override
public String getMethodDoc(OperationResourceInfo ori) {
- Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
- : ori.getAnnotatedMethod();
- String methodKey = method.getDeclaringClass().getName()
+ Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
+ : ori.getAnnotatedMethod();
+ String methodKey = method.getDeclaringClass().getName()
+ "." + method.getName();
return dumpedDocFile.getProperty(methodKey);
}
@Override
public String getMethodResponseDoc(OperationResourceInfo ori) {
- Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
- : ori.getAnnotatedMethod();
- String methodResponseKey = method.getDeclaringClass().getName()
+ Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
+ : ori.getAnnotatedMethod();
+ String methodResponseKey = method.getDeclaringClass().getName()
+ "." + method.getName() + "." + "returnCommentTag";
return dumpedDocFile.getProperty(methodResponseKey);
}
@Override
public String getMethodParameterDoc(OperationResourceInfo ori, int paramIndex) {
- Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
- : ori.getAnnotatedMethod();
- String methodParamKey = method.getDeclaringClass().getName()
+ Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
+ : ori.getAnnotatedMethod();
+ String methodParamKey = method.getDeclaringClass().getName()
+ "." + method.getName()
+ ".paramCommentTag." + paramIndex;
return dumpedDocFile.getProperty(methodParamKey);
}
-
+
private Class<?> getPathAnnotatedClass(Class<?> cls) {
- if (cls.getAnnotation(Path.class) != null) {
+ if (cls.getAnnotation(Path.class) != null) {
return cls;
}
if (cls.getSuperclass().getAnnotation(Path.class) != null) {
@@ -88,7 +88,7 @@ public class ResourceMapJavaDocProvider implements DocumentationProvider {
}
for (Class<?> i : cls.getInterfaces()) {
if (i.getAnnotation(Path.class) != null) {
- return i;
+ return i;
}
}
return cls;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index aeda298..8f4a3cb 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -50,7 +50,7 @@ public class ClassLoaderSwitcher {
/**
* Create and set the classloader that is needed for creating the java sources from wsdl
- *
+ *
* @param project
* @param useCompileClasspath
* @param classesDir
@@ -62,7 +62,7 @@ public class ClassLoaderSwitcher {
List<URL> urlList = new ArrayList<>();
StringBuilder buf = new StringBuilder();
-
+
try {
buf.append(classpath);
buf.append(File.pathSeparatorChar);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
index 21fd51f..3eafad2 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
@@ -92,8 +92,8 @@ public class Java2WSMojo extends AbstractMojo {
* @parameter
*/
private String address;
-
-
+
+
/**
* @parameter
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
index bd1b8c1..615613f 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
@@ -55,7 +55,7 @@ public class ClassLoaderSwitcher {
/**
* Create and set the classloader that is needed for creating the java sources from wsdl
- *
+ *
* @param project
* @param useCompileClasspath
* @param classesDir
@@ -66,7 +66,7 @@ public class ClassLoaderSwitcher {
List<URL> urlList = new ArrayList<>();
StringBuilder buf = new StringBuilder();
Set<URI> ret = new LinkedHashSet<URI>();
-
+
try {
urlList.add(classesDir.toURI().toURL());
if (!useCompileClasspath) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java
index d40c2f3..1b4620f 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java
@@ -28,11 +28,11 @@ public class DocumentArtifact {
private String artifactId;
private String version;
private String type;
-
+
public DocumentArtifact() {
type = "wadl";
}
-
+
public String getGroupId() {
return groupId;
}
@@ -57,10 +57,10 @@ public class DocumentArtifact {
public void setType(String type) {
this.type = type;
}
-
+
public boolean doesMatch(DocumentArtifact artifact) {
return type.equals(artifact.getType()) && groupId.equals(artifact.getGroupId())
- && artifactId.equals(artifact.getArtifactId())
+ && artifactId.equals(artifact.getArtifactId())
&& (version == null || version.equals(artifact.getVersion()));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
index c62ab8f..b7a68b8 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
@@ -45,9 +45,9 @@ public final class ForkOnceCodeGenerator {
for (int x = 0; x < i; x++) {
wargs[x] = reader.readLine();
}
-
+
new WADLToJava(wargs).run(new ToolContext());
-
+
line = reader.readLine();
}
reader.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
index 9f5aed5..352a9d2 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
@@ -99,8 +99,8 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
*/
@Parameter(property = "cxf.useCompileClasspath", defaultValue = "false")
boolean useCompileClasspath;
-
-
+
+
/**
* Disables the scanning of the wadlRoot/testWadlRoot directories configured above.
* By default, we scan for *.wadl (see include/exclude params as well) in the wadlRoot
@@ -137,7 +137,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
*/
@Parameter(defaultValue = "false")
String fork;
-
+
/**
* The Maven session.
*/
@@ -149,7 +149,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
*/
@Parameter(readonly = true, required = true, property = "plugin.artifacts")
private List<Artifact> pluginArtifacts;
-
+
/**
* Sets the Java executable to use when fork parameter is <code>true</code>.
@@ -162,17 +162,17 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
*/
@Parameter
private String additionalJvmArgs;
-
+
@Component
private RepositorySystem repositorySystem;
-
-
+
+
private ClassLoader resourceClassLoader;
-
+
private Artifact resolveRemoteWadlArtifact(Artifact artifact)
throws MojoExecutionException {
-
+
/**
* First try to find the artifact in the reactor projects of the maven session.
* So an artifact that is not yet built can be resolved
@@ -180,7 +180,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
List<MavenProject> rProjects = mavenSession.getProjects();
for (MavenProject rProject : rProjects) {
if (artifact.getGroupId().equals(rProject.getGroupId())
- && artifact.getArtifactId().equals(rProject.getArtifactId())
+ && artifact.getArtifactId().equals(rProject.getArtifactId())
&& artifact.getVersion().equals(rProject.getVersion())) {
Set<Artifact> artifacts = rProject.getArtifacts();
for (Artifact pArtifact : artifacts) {
@@ -190,7 +190,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
}
}
-
+
ArtifactResolutionRequest request = new ArtifactResolutionRequest();
request.setArtifact(artifact);
request.setResolveRoot(true).setResolveTransitively(false);
@@ -198,14 +198,14 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
request.setMirrors(mavenSession.getRequest().getMirrors());
request.setProxies(mavenSession.getRequest().getProxies());
request.setLocalRepository(mavenSession.getLocalRepository());
- request.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
+ request.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
ArtifactResolutionResult result = repositorySystem.resolve(request);
-
+
return result.getOriginatingArtifact();
}
protected void downloadRemoteDocs(List<WadlOption> effectiveOptions) throws MojoExecutionException {
-
+
for (WadlOption option : effectiveOptions) {
DocumentArtifact wadlA = option.getWadlArtifact();
if (wadlA == null) {
@@ -213,7 +213,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
Artifact wadlArtifact = repositorySystem.createArtifact(wadlA.getGroupId(),
wadlA.getArtifactId(),
- wadlA.getVersion(),
+ wadlA.getVersion(),
wadlA.getType());
wadlArtifact = resolveRemoteWadlArtifact(wadlArtifact);
@@ -225,12 +225,12 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
}
-
-
+
+
private void addPluginArtifact(Set<URI> artifactsPath) {
//for Maven 2.x, the actual artifact isn't in the list.... need to try and find it
URL url = getClass().getResource(getClass().getSimpleName() + ".class");
-
+
try {
if ("jar".equals(url.getProtocol())) {
String s = url.getPath();
@@ -255,7 +255,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
- protected void forkOnce(Set<URI> classPath, List<WadlOption> effectiveOptions)
+ protected void forkOnce(Set<URI> classPath, List<WadlOption> effectiveOptions)
throws MojoExecutionException {
List<WadlOption> toDo = new LinkedList<WadlOption>();
List<List<String>> wargs = new LinkedList<List<String>>();
@@ -265,14 +265,14 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
URI basedir = project.getBasedir().toURI();
for (URI wadlURI : option.getWadlURIs(basedir, getResourceLoader())) {
File doneFile = getDoneFile(basedir, wadlURI);
-
+
if (!shouldRun(option, doneFile, wadlURI)) {
continue;
}
doneFile.delete();
-
+
toDo.add(option);
-
+
wargs.add(option.generateCommandLine(outputDirFile, basedir, wadlURI, getLog()
.isDebugEnabled()));
}
@@ -280,7 +280,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
if (wargs.isEmpty()) {
return;
}
-
+
Set<URI> artifactsPath = new LinkedHashSet<URI>();
for (Artifact a : pluginArtifacts) {
File file = a.getFile();
@@ -293,10 +293,10 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
addPluginArtifact(artifactsPath);
artifactsPath.addAll(classPath);
-
+
String args[] = createForkOnceArgs(wargs);
runForked(artifactsPath, ForkOnceCodeGenerator.class, args);
-
+
for (WadlOption option : toDo) {
File dirs[] = option.getDeleteDirs();
if (dirs != null) {
@@ -363,27 +363,27 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
return resourceClassLoader;
}
-
- protected Bus callCodeGenerator(WadlOption option,
+
+ protected Bus callCodeGenerator(WadlOption option,
Bus bus,
Set<URI> classPath) throws MojoExecutionException {
File outputDirFile = option.getOutputDir();
outputDirFile.mkdirs();
URI basedir = project.getBasedir().toURI();
-
+
for (URI wadlURI : option.getWadlURIs(basedir, getResourceLoader())) {
File doneFile = getDoneFile(basedir, wadlURI);
-
+
if (!shouldRun(option, doneFile, wadlURI)) {
return bus;
}
doneFile.delete();
-
+
List<String> list = option.generateCommandLine(outputDirFile, basedir, wadlURI, getLog()
.isDebugEnabled());
String[] args = list.toArray(new String[list.size()]);
getLog().debug("Calling wadl2java with args: " + Arrays.toString(args));
-
+
if (!"false".equals(fork)) {
Set<URI> artifactsPath = new LinkedHashSet<URI>();
for (Artifact a : pluginArtifacts) {
@@ -397,9 +397,9 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
addPluginArtifact(artifactsPath);
artifactsPath.addAll(classPath);
-
+
runForked(artifactsPath, WADLToJava.class, args);
-
+
} else {
if (bus == null) {
bus = BusFactory.newInstance().createBus();
@@ -410,10 +410,10 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
} catch (Throwable e) {
getLog().debug(e);
throw new MojoExecutionException(e.getMessage(), e);
- }
+ }
}
-
-
+
+
try {
doneFile.createNewFile();
} catch (Throwable e) {
@@ -449,15 +449,15 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
cmd.createArg().setLine(additionalJvmArgs);
-
+
File file = null;
try {
- //file = new File("/tmp/test.jar");
+ //file = new File("/tmp/test.jar");
file = FileUtils.createTempFile("cxf-codegen", ".jar");
JarArchiver jar = new JarArchiver();
jar.setDestFile(file.getAbsoluteFile());
-
+
Manifest manifest = new Manifest();
Attribute attr = new Attribute();
attr.setName("Class-Path");
@@ -467,7 +467,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
attr.setValue(b.toString());
manifest.getMainSection().addConfiguredAttribute(attr);
-
+
attr = new Attribute();
attr.setName("Main-Class");
attr.setValue(cls.getName());
@@ -475,16 +475,16 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
jar.addConfiguredManifest(manifest);
jar.createArchive();
-
+
cmd.createArg().setValue("-jar");
cmd.createArg().setValue(file.getAbsolutePath());
-
+
} catch (Exception e1) {
throw new MojoExecutionException("Could not create runtime jar", e1);
}
cmd.addArguments(args);
-
+
CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer out = new CommandLineUtils.StringStreamConsumer();
@@ -532,7 +532,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
private File getDoneFile(URI basedir, URI wadlURI) {
String doneFileName = wadlURI.toString();
-
+
// Strip the basedir from the doneFileName
if (doneFileName.startsWith(basedir.toString())) {
doneFileName = doneFileName.substring(basedir.toString().length());
@@ -548,7 +548,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
/**
* Determine if code should be generated from the given wadl
- *
+ *
* @param wadlOption
* @param doneFile
* @param wadlURI
@@ -585,7 +585,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
/**
* Recursively delete the given directory
- *
+ *
* @param f
* @return
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
index 946038f..785c7ce 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
@@ -33,7 +33,7 @@ public class Option {
protected File outputDir;
/**
- * A set of dependent files used to detect the generator must process WSDL, even
+ * A set of dependent files used to detect the generator must process WSDL, even
* if generator marker files are up to date.
*/
File dependencies[];
@@ -42,7 +42,7 @@ public class Option {
* Redundant directories to be deleted after code generation
*/
File redundantDirs[];
-
+
/**
* Extra arguments to pass to the command-line code generator. For compatibility as well as to
* specify any extra flags not addressed by other parameters
@@ -58,35 +58,35 @@ public class Option {
* Specifies catalog file to map the imported wadl/schema
*/
String catalog;
-
+
/**
* Specifies resource id
*/
private String resourcename;
-
+
/**
- * Specifies package name of WADL resource elements
+ * Specifies package name of WADL resource elements
*/
private String packagename;
-
+
/**
* Enables or disables generation of the impl classes. Default value is false.
* If set then only implementation classes will be generated
*/
private Boolean generateImpl;
-
+
/**
* Enables or disables generation of the interface classes. Setting this property
* only makes sense when generateImpl is also set. In other cases it is ignored and
* interfaces are always generated.
- *
- *
- *
+ *
+ *
+ *
*/
private Boolean generateInterface;
-
+
/**
- *
+ *
*/
private List<String> schemaPackagenames = new ArrayList<>();
@@ -117,7 +117,7 @@ public class Option {
public void setOutputDir(File f) {
outputDir = f;
}
-
+
public void setBindingFiles(String files[]) {
bindingFiles = files;
}
@@ -130,7 +130,7 @@ public class Option {
bindingFiles = tmp;
bindingFiles[bindingFiles.length - 1] = file.getAbsolutePath();
}
-
+
public List<String> getSchemaPackagenames() {
return schemaPackagenames;
}
@@ -138,7 +138,7 @@ public class Option {
public void setSchemaPackagenames(List<String> pn) {
this.schemaPackagenames = pn;
}
-
+
public String getCatalog() {
return catalog;
}
@@ -146,7 +146,7 @@ public class Option {
public void setCatalog(String catalog) {
this.catalog = catalog;
}
-
+
public String getPackagename() {
return packagename;
}
@@ -166,15 +166,15 @@ public class Option {
public boolean isImpl() {
return generateImpl == null ? false : generateImpl;
}
-
+
public void setImpl(boolean impl) {
this.generateImpl = impl;
}
-
+
public boolean isInterface() {
return generateInterface == null ? false : generateInterface;
}
-
+
public void setInterface(boolean interf) {
this.generateInterface = interf;
}
@@ -187,7 +187,7 @@ public class Option {
this.extraargs.clear();
this.extraargs.addAll(ea);
}
-
+
public void copyOptions(Option destination) {
destination.setBindingFiles(getBindingFiles());
destination.setCatalog(getCatalog());
@@ -198,16 +198,16 @@ public class Option {
destination.setOutputDir(getOutputDir());
destination.setExtraargs(getExtraargs());
}
-
-
-
+
+
+
private <T> T setIfNull(T dest, T source) {
if (dest == null) {
dest = source;
}
return dest;
}
-
+
public void merge(Option defaultOptions) {
catalog = setIfNull(catalog, defaultOptions.catalog);
generateImpl = setIfNull(generateImpl, defaultOptions.generateImpl);
@@ -220,7 +220,7 @@ public class Option {
schemaPackagenames.addAll(defaultOptions.schemaPackagenames);
extraargs.addAll(defaultOptions.extraargs);
}
-
+
@SuppressWarnings("unchecked")
private <T> T[] mergeList(T[] l1, T[] l2, Class<T> cls) {
if (l1 == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
index 3c8abc0..d0c728f 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
@@ -37,11 +37,11 @@ public final class OptionLoader {
private static final String WADL_TYPE = "wadl";
private static final String WADL_OPTIONS = "-options$";
private static final String WADL_BINDINGS = "-binding-?\\d*.xml$";
-
+
private OptionLoader() {
}
-
- public static List<WadlOption> loadWsdlOptionsFromDependencies(MavenProject project,
+
+ public static List<WadlOption> loadWsdlOptionsFromDependencies(MavenProject project,
Option defaultOptions, File outputDir) {
List<WadlOption> options = new ArrayList<>();
Set<Artifact> dependencies = project.getDependencyArtifacts();
@@ -76,7 +76,7 @@ public final class OptionLoader {
* Scan files in a directory and generate one wadlOption per file found. Extra args for code generation
* can be defined in a file that is named like the wadl file and ends in -options. Binding files can be
* defined in files named like the wadl file and end in -binding-*.xml
- *
+ *
* @param wadlBasedir
* @param includes file name patterns to include
* @param excludes file name patterns to exclude
@@ -84,9 +84,9 @@ public final class OptionLoader {
* @return list of one WadlOption object for each wadl found
* @throws MojoExecutionException
*/
- public static List<WadlOption> loadWadlOptionsFromFile(File wadlBasedir,
+ public static List<WadlOption> loadWadlOptionsFromFile(File wadlBasedir,
String includes[],
- String excludes[],
+ String excludes[],
Option defaultOptions,
File defaultOutputDir)
throws MojoExecutionException {
@@ -146,7 +146,7 @@ public final class OptionLoader {
}
- protected static WadlOption generateWadlOptionFromFile(final File wadl,
+ protected static WadlOption generateWadlOptionFromFile(final File wadl,
final Option defaultOptions,
File defaultOutputDir)
throws MojoExecutionException {
@@ -168,15 +168,15 @@ public final class OptionLoader {
if (defaultOptions != null) {
wadlOption.merge(defaultOptions);
}
-
-
+
+
final String wadlName = wadlFileName.substring(0, idx);
final String[] options = readOptionsFromFile(wadl.getParentFile(), wadlName);
if (options.length > 0) {
wadlOption.getExtraargs().addAll(Arrays.asList(options));
}
-
+
List<File> bindingFiles = FileUtils.getFiles(wadl.getParentFile(), wadlName + WADL_BINDINGS);
if (bindingFiles != null) {
for (File binding : bindingFiles) {
@@ -184,17 +184,17 @@ public final class OptionLoader {
}
}
wadlOption.setWadl(wadl.toURI().toString());
-
+
if (wadlOption.getOutputDir() == null) {
wadlOption.setOutputDir(defaultOutputDir);
}
return wadlOption;
}
-
+
private static String[] readOptionsFromFile(File dir, String wsdlName) throws MojoExecutionException {
String[] noOptions = new String[] {};
- List<File> files = FileUtils.getFiles(dir, wsdlName + WADL_OPTIONS);
+ List<File> files = FileUtils.getFiles(dir, wsdlName + WADL_OPTIONS);
if (files.size() <= 0) {
return noOptions;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
index 3ce347d..25b8fbd 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
@@ -50,11 +50,11 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
@Parameter(property = "cxf.testWadlRoot", defaultValue = "${basedir}/src/test/resources/wadl")
File testWadlRoot;
-
-
+
+
@Component
BuildContext buildContext;
-
+
private void mergeOptions(List<WadlOption> effectiveOptions) {
if (wadlOptions == null) {
return;
@@ -76,7 +76,7 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
File classesDir = new File(classesDirectory);
classesDir.mkdirs();
markerDirectory.mkdirs();
-
+
// add the generated source into compile source
// do this step first to ensure the source folder will be added to the Eclipse classpath
if (project != null && sourceRoot != null) {
@@ -85,7 +85,7 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
if (project != null && testSourceRoot != null) {
project.addTestCompileSourceRoot(testSourceRoot.getAbsolutePath());
}
-
+
// if this is an m2e configuration build then return immediately without doing any work
if (project != null && buildContext.isIncremental() && !buildContext.hasDelta(project.getBasedir())) {
return;
@@ -110,7 +110,7 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
} else {
for (WadlOption o : effectiveWsdlOptions) {
bus = callCodeGenerator(o, bus, cp);
-
+
File dirs[] = o.getDeleteDirs();
if (dirs != null) {
for (int idx = 0; idx < dirs.length; ++idx) {
@@ -129,12 +129,12 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
System.gc();
}
-
+
/**
* @return effective WsdlOptions
* @throws MojoExecutionException
*/
- private List<WadlOption> createWadlOptionsFromScansAndExplicitWadlOptions(File classesDir)
+ private List<WadlOption> createWadlOptionsFromScansAndExplicitWadlOptions(File classesDir)
throws MojoExecutionException {
List<WadlOption> effectiveOptions = new ArrayList<>();
mergeOptions(effectiveOptions);
@@ -147,13 +147,13 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
}
File defaultRoot = wadlRoot != null && wadlRoot.exists() ? wadlRoot : testWadlRoot;
effectiveOptions.addAll(
- OptionLoader.loadWadlOptionsFromFile(defaultRoot,
- includes,
- excludes,
- defaultOptions,
+ OptionLoader.loadWadlOptionsFromFile(defaultRoot,
+ includes,
+ excludes,
+ defaultOptions,
classesDir));
}
return effectiveOptions;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java
index 0d19d71..8e6a008 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java
@@ -39,7 +39,7 @@ public class WadlOption extends Option {
String wadl;
String wadlFileExtension = "wadl";
-
+
/**
* Alternatively to the wadl string an artifact can be specified
*/
@@ -48,7 +48,7 @@ public class WadlOption extends Option {
public WadlOption() {
super();
}
-
+
public String getWadl() {
return wadl;
}
@@ -64,11 +64,11 @@ public class WadlOption extends Option {
public void setWadlArtifact(DocumentArtifact wadlArtifact) {
this.wadlArtifact = wadlArtifact;
}
-
+
/**
* Try to find a file matching the wadl path (either absolutely, relatively to the current dir or to
* the project base dir)
- *
+ *
* @return wadl file
*/
public File getDocumentFile(File baseDir) {
@@ -92,7 +92,7 @@ public class WadlOption extends Option {
}
return file;
}
-
+
public List<URI> getWadlURIs(URI baseURI, ClassLoader resourceLoader) {
String wadlLocation = getWadl();
if (wadlLocation.contains(".") && !wadlLocation.contains("*")) {
@@ -108,10 +108,10 @@ public class WadlOption extends Option {
}
return uris;
}
-
+
private URI getWadlURI(URI baseURI, String wadlLocation) {
File wadlFile = new File(wadlLocation);
- return wadlFile.exists() ? wadlFile.toURI()
+ return wadlFile.exists() ? wadlFile.toURI()
: baseURI.resolve(URIParserUtil.escapeChars(wadlLocation));
}
@@ -160,9 +160,9 @@ public class WadlOption extends Option {
return list;
}
-
+
// TODO: the following 3 helpers can go to a superclass or common utility class
- // to be used by WADL and WSDL Pptions
+ // to be used by WADL and WSDL Pptions
private static void addIfNotNull(List<String> list, Object value, String key) {
if (value != null) {
list.add(key);
@@ -186,7 +186,7 @@ public class WadlOption extends Option {
}
}
}
-
+
private static void addIfTrue(List<String> list, boolean expression, String key) {
if (expression) {
list.add(key);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
index a47f4a4..c5079ca 100644
--- a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
+++ b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
@@ -53,28 +53,28 @@ public class WSDLValidatorMojo extends AbstractMojo {
* @parameter expression="${cxf.wsdlRoot}" default-value="${basedir}/src/main/resources/wsdl"
*/
private File wsdlRoot;
-
+
/**
* @parameter expression="${cxf.testWsdlRoot}" default-value="${basedir}/src/test/resources/wsdl"
*/
private File testWsdlRoot;
-
+
/**
- * Directory in which the "DONE" markers are saved that
- * @parameter expression="${cxf.markerDirectory}"
+ * Directory in which the "DONE" markers are saved that
+ * @parameter expression="${cxf.markerDirectory}"
* default-value="${project.build.directory}/cxf-wsdl-validator-markers"
*/
private File markerDirectory;
/**
* A list of wsdl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
* *.wsdl
- *
+ *
* @parameter
*/
private String includes[];
/**
* A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
- *
+ *
* @parameter
*/
private String excludes[];
@@ -93,7 +93,7 @@ public class WSDLValidatorMojo extends AbstractMojo {
}
return str.toString();
}
-
+
private List<File> getWsdlFiles(File dir)
throws MojoExecutionException {
@@ -113,9 +113,9 @@ public class WSDLValidatorMojo extends AbstractMojo {
throw new MojoExecutionException(exc.getMessage(), exc);
}
}
-
+
private void processWsdl(File file) throws MojoExecutionException {
-
+
// If URL to WSDL, replace ? and & since they're invalid chars for file names
File doneFile =
new File(markerDirectory, "." + file.getName().replace('?', '_').replace('&', '_') + ".DONE");
@@ -124,11 +124,11 @@ public class WSDLValidatorMojo extends AbstractMojo {
doWork = true;
} else if (file.lastModified() > doneFile.lastModified()) {
doWork = true;
- }
+ }
if (doWork) {
doneFile.delete();
-
+
List<String> list = new ArrayList<>();
// verbose arg
@@ -145,7 +145,7 @@ public class WSDLValidatorMojo extends AbstractMojo {
try {
list.add(file.getCanonicalPath());
String[] pargs = list.toArray(new String[list.size()]);
-
+
ToolSpec spec = null;
try (InputStream toolspecStream = WSDLValidator.class .getResourceAsStream("wsdlvalidator.xml")) {
spec = new ToolSpec(toolspecStream, false);
@@ -159,7 +159,7 @@ public class WSDLValidatorMojo extends AbstractMojo {
doneFile.createNewFile();
} catch (Throwable e) {
- throw new MojoExecutionException(file.getName() + ": "
+ throw new MojoExecutionException(file.getName() + ": "
+ e.getMessage(), e);
}
}
@@ -171,9 +171,9 @@ public class WSDLValidatorMojo extends AbstractMojo {
"*.wsdl"
};
}
-
+
markerDirectory.mkdirs();
-
+
List<File> wsdls = new ArrayList<>();
if (wsdlRoot != null && wsdlRoot.exists()) {
wsdls.addAll(getWsdlFiles(wsdlRoot));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
index 8f0360a..57ba7fc 100644
--- a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
+++ b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
@@ -37,7 +37,7 @@ import static org.ops4j.pax.exam.CoreOptions.when;
public class NoAriesBlueprintTest extends OSGiTestSupport {
/**
* Make sure cxf bundles start up without aries blueprint
- *
+ *
* @throws Exception
*/
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
index 5d842ff..9523faf 100644
--- a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
+++ b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
@@ -29,19 +29,19 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
/**
- *
+ *
*/
public class OSGiTestSupport {
@Inject
protected BundleContext bundleContext;
-
+
protected void assertBundleStarted(String name) {
Bundle bundle = findBundleByName(name);
Assert.assertNotNull("Bundle " + name + " should be installed", bundle);
Assert.assertEquals("Bundle " + name + " should be started", Bundle.ACTIVE, bundle.getState());
}
-
+
protected Bundle findBundleByName(String symbolicName) {
for (Bundle bundle : bundleContext.getBundles()) {
if (bundle.getSymbolicName().equals(symbolicName)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
index 6917b28..74d7d33 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
@@ -44,7 +44,7 @@ public class BundlesAndNamespacesTest extends CXFOSGiTestSupport {
assertBlueprintNamespacePublished("http://cxf.apache.org/configuration/parameterized-types", 1000);
assertBlueprintNamespacePublished("http://cxf.apache.org/configuration/security", 1000);
assertBlueprintNamespacePublished("http://schemas.xmlsoap.org/wsdl/", 1000);
-
+
assertBundleStarted("org.apache.cxf.cxf-rt-frontend-jaxws");
assertBlueprintNamespacePublished("http://cxf.apache.org/blueprint/jaxws", 1000);
assertBlueprintNamespacePublished("http://cxf.apache.org/blueprint/simple", 1000);
@@ -54,7 +54,7 @@ public class BundlesAndNamespacesTest extends CXFOSGiTestSupport {
public Option[] config() {
return new Option[]{
cxfBaseConfig(),
- replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg",
+ replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg",
getConfigFile("/etc/org.ops4j.pax.logging.cfg")),
features(cxfUrl, "cxf-core", "cxf-jaxws"),
logLevel(LogLevel.INFO)};
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index cd6e41c..3ca758a 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -68,7 +68,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
/**
- *
+ *
*/
public class CXFOSGiTestSupport {
private static final String MAVEN_DEPENDENCIES_PROPERTIES = "/META-INF/maven/dependencies.properties";
@@ -128,10 +128,10 @@ public class CXFOSGiTestSupport {
} catch (Throwable t) {
throw new IllegalStateException(MAVEN_DEPENDENCIES_PROPERTIES + " can not be found", t);
}
- }
+ }
/**
* Create an {@link org.ops4j.pax.exam.Option} for using a .
- *
+ *
* @return
*/
protected Option cxfBaseConfig() {
@@ -160,10 +160,10 @@ public class CXFOSGiTestSupport {
protected Option testUtils() {
return mavenBundle().groupId("org.apache.cxf").artifactId("cxf-testutils").versionAsInProject();
}
-
+
/**
* Executes a shell command and returns output as a String. Commands have a default timeout of 10 seconds.
- *
+ *
* @param command
* @return
*/
@@ -173,7 +173,7 @@ public class CXFOSGiTestSupport {
/**
* Executes a shell command and returns output as a String. Commands have a default timeout of 10 seconds.
- *
+ *
* @param command The command to execute.
* @param timeout The amount of time in millis to wait for the command to execute.
* @param silent Specifies if the command should be displayed in the screen.
@@ -214,7 +214,7 @@ public class CXFOSGiTestSupport {
/**
* Executes multiple commands inside a Single Session. Commands have a default timeout of 10 seconds.
- *
+ *
* @param commands
* @return
*/
@@ -329,7 +329,7 @@ public class CXFOSGiTestSupport {
/**
* Finds a free port starting from the give port numner.
- *
+ *
* @return
*/
protected int getFreePort(int port) {
@@ -341,7 +341,7 @@ public class CXFOSGiTestSupport {
/**
* Returns true if port is available for use.
- *
+ *
* @param port
* @return
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java
index 10bab48..6428261 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java
@@ -29,15 +29,15 @@ public class Book {
private String name;
@Min(0)
private long id;
-
+
public Book() {
}
-
+
public Book(String name, long id) {
this.name = name;
this.id = id;
}
-
+
public void setName(String n) {
name = n;
}
@@ -45,12 +45,12 @@ public class Book {
public String getName() {
return name;
}
-
+
public void setId(long i) {
id = i;
}
public long getId() {
return id;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
index 07a55bb..a8961ba 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
@@ -55,12 +55,12 @@ import org.hibernate.validator.HibernateValidatorConfiguration;
public class BookStore {
private Map<Long, Book> books = new HashMap<Long, Book>();
- @Context
+ @Context
private UriInfo ui;
- @Context
+ @Context
private ResourceInfo rcInfo;
-
+
@Context
private ResourceContext resourceContext;
@@ -70,7 +70,7 @@ public class BookStore {
public BookStore() {
init();
}
-
+
@GET
@Path("/books/{id}")
public Response getBookRoot(@PathParam("id") Long id) {
@@ -85,7 +85,7 @@ public class BookStore {
@PUT
@Path("/books/{id}")
public Response updateBook(@PathParam("id") Long id, Book book) {
- assertInjections();
+ assertInjections();
Book b = books.get(id);
if (b == null) {
return Response.status(Status.NOT_FOUND).build();
@@ -124,7 +124,7 @@ public class BookStore {
return createBook(book);
}
-
+
@POST
@Path("/books")
public Response createBook(Book book) {
@@ -154,13 +154,13 @@ public class BookStore {
private void init() {
books.clear();
-
+
Book book = new Book();
book.setId(123);
book.setName("CXF in Action");
books.put(book.getId(), book);
}
-
+
private void assertInjections() {
if (ui.getAbsolutePath() == null) {
throw new IllegalArgumentException("UriInfo absolute path is null");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
index ccccdcc..4e01a17 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
@@ -56,13 +56,13 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
Client client = ClientBuilder.newClient();
wt = client.target(BASE_URL);
}
-
+
@Test
public void testJaxRsGet() throws Exception {
Book book = wt.path("/books/123").request("application/xml").get(Book.class);
Assert.assertNotNull(book);
}
-
+
@Test
public void testJaxRsPost() throws Exception {
Book book = new Book();
@@ -104,7 +104,7 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
Assert.assertEquals(Status.OK.getStatusCode(), response.getStatus());
}
-
+
@Configuration
public Option[] config() {
return new Option[] {
@@ -127,5 +127,5 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
.set(Constants.BUNDLE_ACTIVATOR, JaxRsTestActivator.class.getName())
.build(TinyBundles.withBnd());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
index 3aa9c1a..9b007a4 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
@@ -56,14 +56,14 @@ public class HttpServiceTest extends CXFOSGiTestSupport {
String res = greeter.greetMe("Chris");
Assert.assertEquals("Hi Chris", res);
}
-
+
private Greeter greeterHttpProxy(String port) {
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
factory.setServiceClass(Greeter.class);
factory.setAddress("http://localhost:" + port + "/cxf/greeter");
return factory.create(Greeter.class);
}
-
+
@Configuration
public Option[] config() {
return new Option[] {
@@ -83,5 +83,5 @@ public class HttpServiceTest extends CXFOSGiTestSupport {
.set(Constants.BUNDLE_ACTIVATOR, HttpTestActivator.class.getName())
.build(TinyBundles.withBnd());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
index 6fa7226..06ae938 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
@@ -36,7 +36,7 @@ public class HttpTestActivator implements BundleActivator {
factory.setAddress("/greeter");
factory.setServiceBean(new GreeterImpl());
server = factory.create();
-
+
factory = new JaxWsServerFactoryBean();
factory.setServiceClass(Greeter.class);
factory.setAddress("http://localhost:" + PORT + "/cxf/greeter");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index 7a797e8..6363b28 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -66,7 +66,7 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
}
private ActiveMQConnectionFactory createConnectionFactory() {
- ActiveMQConnectionFactory connectionFactory
+ ActiveMQConnectionFactory connectionFactory
= new ActiveMQConnectionFactory("vm://JmsServiceTest");
connectionFactory.setUserName("karaf");
connectionFactory.setPassword("karaf");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java
index 213b623..44fc44f 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java
@@ -50,7 +50,7 @@ public class JmsTestActivator implements BundleActivator {
}
private ActiveMQConnectionFactory createConnectionFactory() {
- ActiveMQConnectionFactory connectionFactory
+ ActiveMQConnectionFactory connectionFactory
= new ActiveMQConnectionFactory("vm://JmsServiceTest");
connectionFactory.setUserName("karaf");
connectionFactory.setPassword("karaf");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
index 5ea70a8..c6ca7d9 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
@@ -32,7 +32,7 @@ import org.apache.karaf.shell.api.console.Terminal;
import org.apache.karaf.shell.support.table.ShellTable;
/**
- *
+ *
*/
@Command(scope = "cxf", name = "list-busses", description = "Lists all CXF Busses.")
@Service