You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ij...@apache.org on 2014/01/15 11:43:03 UTC
svn commit: r1558338 - in /jena/trunk/jena-maven-tools: ./
src/main/java/org/apache/ src/main/java/org/apache/jena/
src/main/java/org/apache/jena/tools/
src/main/java/org/apache/jena/tools/schemagen/ src/main/java/org/openjena/
src/test/java/org/apache...
Author: ijd
Date: Wed Jan 15 10:43:03 2014
New Revision: 1558338
URL: http://svn.apache.org/r1558338
Log:
Moved code to org.apache.jena package hierarchy
Added:
jena/trunk/jena-maven-tools/src/main/java/org/apache/
jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/
jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/
jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/
jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java
- copied, changed from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenMojo.java
jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOption.java
- copied, changed from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOption.java
jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java
- copied, changed from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOptions.java
jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptionsConfigurationException.java
- copied, changed from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOptionsConfigurationException.java
jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java
- copied, changed from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/Source.java
jena/trunk/jena-maven-tools/src/test/java/org/apache/
jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/
jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/
jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/
jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenMojoTest.java
- copied, changed from r1558331, jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SchemagenMojoTest.java
jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenOptionsTest.java
- copied, changed from r1558331, jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SchemagenOptionsTest.java
jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java
- copied, changed from r1558331, jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SourceParameterTest.java
jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceTest.java
- copied, changed from r1558331, jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SourceTest.java
Removed:
jena/trunk/jena-maven-tools/src/main/java/org/openjena/
jena/trunk/jena-maven-tools/src/test/java/org/openjena/
Modified:
jena/trunk/jena-maven-tools/pom.xml
Modified: jena/trunk/jena-maven-tools/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/pom.xml?rev=1558338&r1=1558337&r2=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/pom.xml (original)
+++ jena/trunk/jena-maven-tools/pom.xml Wed Jan 15 10:43:03 2014
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jena-maven-tools</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.3-SNAPSHOT</version>
+ <version>0.4-SNAPSHOT</version>
<name>Jena plugins for Apache Maven,including schemagen</name>
<description>Plugins for Apache Maven to perform source management activities,
such as generating Java files from RDF vocabulary sources using
@@ -104,7 +104,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -131,7 +131,7 @@
<execution>
<id>integration-test</id>
<goals>
- <goal>install</goal>
+ <goal>install</goal>
<goal>run</goal>
</goals>
</execution>
@@ -162,9 +162,9 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
Copied: jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java (from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenMojo.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java?p2=jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java&p1=jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenMojo.java&r1=1558331&r2=1558338&rev=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenMojo.java (original)
+++ jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java Wed Jan 15 10:43:03 2014
@@ -19,7 +19,7 @@
// Package
///////////////
-package org.openjena.tools.schemagen;
+package org.apache.jena.tools.schemagen;
// Imports
@@ -80,11 +80,11 @@ public class SchemagenMojo
/**
* @parameter property="project.build.directory"
*/
-
+
@Parameter(property="project.build.directory")
private String projectBuildDir;
-
+
/**
* Array of file patterns to include in processing
*/
@@ -94,13 +94,13 @@ public class SchemagenMojo
/**
* Array of file patterns to exclude from processing
*/
- @Parameter
+ @Parameter
private String[] excludes = new String[0];
/**
* Options for individual files
*/
- @Parameter
+ @Parameter
private List<Source> fileOptions;
/**
@@ -149,7 +149,7 @@ public class SchemagenMojo
// then the files themselves
for (String fileName: matchFileNames()) {
processFile( fileName );
- }
+ }
} catch (SchemagenOptionsConfigurationException e) {
throw new MojoExecutionException(
"Error during default schemagen options creation", e);
@@ -200,7 +200,7 @@ public class SchemagenMojo
* Handle the default options by creating a default options object and assigning
* the options values from the given source object.
* @param defOptionsSource The source object containing the default options
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
protected void handleDefaultOptions( Source defOptionsSource )
throws SchemagenOptionsConfigurationException {
@@ -217,7 +217,7 @@ public class SchemagenMojo
* by attaching the default options and indexing.
*
* @param optionSpec Specification of the options for a given file
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
protected void handleOption( Source optionSpec ) throws SchemagenOptionsConfigurationException {
SchemagenOptions so = new SchemagenOptions(getDefaultOutputDir(), optionSpec);
@@ -233,7 +233,7 @@ public class SchemagenMojo
/**
* Delegate the processing of the given file to schemagen itself
* @param fileName
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
protected void processFile( String fileName )
throws MojoExecutionException, SchemagenOptionsConfigurationException
Copied: jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOption.java (from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOption.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOption.java?p2=jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOption.java&p1=jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOption.java&r1=1558331&r2=1558338&rev=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOption.java (original)
+++ jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOption.java Wed Jan 15 10:43:03 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.tools.schemagen;
+package org.apache.jena.tools.schemagen;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -27,7 +27,7 @@ import jena.schemagen.SchemagenOptions;
/**
* Annotation to designate linkages between Maven configured properties
- * in Source and options in SchemagenOptions.
+ * in Source and options in SchemagenOptions.
*/
@Target(ElementType.METHOD)
@Retention(value = RetentionPolicy.RUNTIME)
Copied: jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java (from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOptions.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java?p2=jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java&p1=jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOptions.java&r1=1558331&r2=1558338&rev=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOptions.java (original)
+++ jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java Wed Jan 15 10:43:03 2014
@@ -16,22 +16,18 @@
* limitations under the License.
*/
-package org.openjena.tools.schemagen;
+package org.apache.jena.tools.schemagen;
// Imports
///////////////
-import java.lang.reflect.Method ;
-import java.util.List ;
+import java.lang.reflect.Method;
+import java.util.List;
-import jena.schemagen ;
-import jena.schemagen.OptionDefinition ;
-import org.slf4j.Logger ;
-import org.slf4j.LoggerFactory ;
-
-import com.hp.hpl.jena.rdf.model.RDFNode ;
-import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.rdf.model.ResourceFactory ;
+import jena.schemagen;
+import jena.schemagen.OptionDefinition;
+
+import com.hp.hpl.jena.rdf.model.*;
/**
@@ -55,8 +51,6 @@ public class SchemagenOptions
/* Static variables */
/***********************************/
- private static final Logger log = LoggerFactory.getLogger( SchemagenOptions.class );
-
/***********************************/
/* Instance variables */
/***********************************/
@@ -83,7 +77,7 @@ public class SchemagenOptions
if (defaultOutputDir != null) {
setOption( OPT.OUTPUT, defaultOutputDir );
}
-
+
//set schemagen options from Maven plugin config Source
if (options != null) {
configure(options);
@@ -192,7 +186,7 @@ public class SchemagenOptions
/**
* Configure SchemagenOptions from Source object
* @param options Options from Maven configuration
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
protected void configure(Source options) throws SchemagenOptionsConfigurationException {
for(Method method : options.getClass().getMethods()) {
@@ -208,9 +202,9 @@ public class SchemagenOptions
OPT option = schemagenOptionAnnotation.opt();
if (optionValue != null) {
if (optionValue instanceof String) {
- setOption(option, (String) optionValue);
+ setOption(option, (String) optionValue);
} else if (optionValue instanceof Boolean) {
- setOption(option, (Boolean) optionValue);
+ setOption(option, (Boolean) optionValue);
} else {
throw new IllegalArgumentException("Schemagen options of type "
+ optionValue.getClass().getCanonicalName()
@@ -220,7 +214,7 @@ public class SchemagenOptions
}
}
}
-
+
protected OPT asOption( String optString ) {
return OPT.valueOf( optString );
}
Copied: jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptionsConfigurationException.java (from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOptionsConfigurationException.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptionsConfigurationException.java?p2=jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptionsConfigurationException.java&p1=jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOptionsConfigurationException.java&r1=1558331&r2=1558338&rev=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenOptionsConfigurationException.java (original)
+++ jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptionsConfigurationException.java Wed Jan 15 10:43:03 2014
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.openjena.tools.schemagen;
+package org.apache.jena.tools.schemagen;
public class SchemagenOptionsConfigurationException extends Exception {
private static final long serialVersionUID = -133784377465911397L;
-
+
public SchemagenOptionsConfigurationException(Throwable cause){
super(cause);
}
Copied: jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java (from r1558331, jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/Source.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java?p2=jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java&p1=jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/Source.java&r1=1558331&r2=1558338&rev=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/Source.java (original)
+++ jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java Wed Jan 15 10:43:03 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.tools.schemagen;
+package org.apache.jena.tools.schemagen;
import jena.schemagen.SchemagenOptions.OPT;
@@ -26,10 +26,10 @@ import org.apache.maven.plugins.annotati
* <p>Simple container object to hold the per-source configuration
* values from the <code>pom.xml</code>.</p> Source objects are used
* configure SchemagenOptions object during plugin execution.
- *
+ *
* Use Parameter annotations on fields to designate Maven properties and
* SchemagenOption annotations on getters to designate SchemagenOptions
- * destination options.
+ * destination options.
*/
public class Source {
/** Name of default options element */
@@ -76,7 +76,7 @@ public class Source {
@Parameter(property="classname")
private String className;
-
+
@Parameter(property="classdec")
private String classDec;
@@ -96,16 +96,16 @@ public class Source {
private String individualsSection;
@Parameter(property="noproperties")
- private Boolean noProperties;
+ private Boolean noProperties;
@Parameter(property="noclasses")
- private Boolean noClasses;
+ private Boolean noClasses;
@Parameter(property="noindividuals")
private Boolean noIndividuals;
@Parameter(property="noheader")
- private Boolean noHeader;
+ private Boolean noHeader;
@Parameter(property="prop-template")
private String propTemplate;
@@ -132,7 +132,7 @@ public class Source {
private Boolean help;
@Parameter
- private Boolean dos;
+ private Boolean dos;
@Parameter(property="use-inf")
private Boolean useInf;
@@ -144,7 +144,7 @@ public class Source {
private Boolean includeSource;
@Parameter(property="no-strict")
- private Boolean noStrict;
+ private Boolean noStrict;
@SchemagenOption(opt=OPT.CONFIG_FILE)
public String getConfigFile() {
@@ -171,7 +171,7 @@ public class Source {
return langOwl;
}
- @SchemagenOption(opt=OPT.LANG_RDFS)
+ @SchemagenOption(opt=OPT.LANG_RDFS)
public Boolean isLangRdfs() {
return langRdfs;
}
@@ -338,7 +338,7 @@ public class Source {
public void setNoComments(Boolean noComments) {
this.noComments = noComments;
}
-
+
public void setInput(String input) {
this.input = input;
}
Copied: jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenMojoTest.java (from r1558331, jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SchemagenMojoTest.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenMojoTest.java?p2=jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenMojoTest.java&p1=jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SchemagenMojoTest.java&r1=1558331&r2=1558338&rev=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SchemagenMojoTest.java (original)
+++ jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenMojoTest.java Wed Jan 15 10:43:03 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.tools.schemagen;
+package org.apache.jena.tools.schemagen;
// Imports
///////////////
@@ -27,7 +27,7 @@ import java.io.File;
import java.util.List;
import org.junit.Test;
-import org.openjena.tools.schemagen.SchemagenMojo;
+import org.apache.jena.tools.schemagen.SchemagenMojo;
/**
* <p>Unit tests for {@link SchemagenMojo}</p>
Copied: jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenOptionsTest.java (from r1558331, jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SchemagenOptionsTest.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenOptionsTest.java?p2=jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenOptionsTest.java&p1=jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SchemagenOptionsTest.java&r1=1558331&r2=1558338&rev=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SchemagenOptionsTest.java (original)
+++ jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SchemagenOptionsTest.java Wed Jan 15 10:43:03 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.tools.schemagen;
+package org.apache.jena.tools.schemagen;
// Imports
@@ -28,9 +28,8 @@ import java.util.List;
import jena.schemagen.SchemagenOptions.OPT;
-import org.junit.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.Before;
+import org.junit.Test;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
@@ -48,8 +47,6 @@ public class SchemagenOptionsTest
/* Static variables */
/***********************************/
- private static final Logger log = LoggerFactory.getLogger( SchemagenOptionsTest.class );
-
/***********************************/
/* Instance variables */
/***********************************/
@@ -72,7 +69,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#getParent()}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testGetParent() throws SchemagenOptionsConfigurationException {
@@ -82,7 +79,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#setParent(org.openjena.tools.schemagen.SchemagenOptions)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testSetParent() throws SchemagenOptionsConfigurationException {
@@ -94,7 +91,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#hasParent()}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testHasParent() throws SchemagenOptionsConfigurationException {
@@ -107,7 +104,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#getOption(jena.schemagen.SchemagenOptions.OPT)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testGetOption0() throws SchemagenOptionsConfigurationException {
@@ -160,7 +157,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#setOption(java.lang.String, java.lang.String)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testSetOptionStringString() throws SchemagenOptionsConfigurationException {
@@ -171,7 +168,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#asOption(java.lang.String)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testAsOption() throws SchemagenOptionsConfigurationException {
@@ -181,7 +178,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#isTrue(jena.schemagen.SchemagenOptions.OPT)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testIsTrueOPT0() throws SchemagenOptionsConfigurationException {
@@ -198,7 +195,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#hasValue(jena.schemagen.SchemagenOptions.OPT)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testHasValueOPT0() throws SchemagenOptionsConfigurationException {
@@ -224,7 +221,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#getValue(jena.schemagen.SchemagenOptions.OPT)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testGetValueOPT0() throws SchemagenOptionsConfigurationException {
@@ -260,7 +257,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#hasResourceValue(jena.schemagen.SchemagenOptions.OPT)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testHasResourceValueOPT0() throws SchemagenOptionsConfigurationException {
@@ -288,7 +285,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#getResource(jena.schemagen.SchemagenOptions.OPT)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testGetResourceOPT0() throws SchemagenOptionsConfigurationException {
@@ -328,7 +325,7 @@ public class SchemagenOptionsTest
/**
* Test method for {@link org.openjena.tools.schemagen.SchemagenOptions#getAllValues(jena.schemagen.SchemagenOptions.OPT)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testGetAllValuesOPT0() throws SchemagenOptionsConfigurationException {
Copied: jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java (from r1558331, jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SourceParameterTest.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java?p2=jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java&p1=jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SourceParameterTest.java&r1=1558331&r2=1558338&rev=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SourceParameterTest.java (original)
+++ jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java Wed Jan 15 10:43:03 2014
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.openjena.tools.schemagen;
+package org.apache.jena.tools.schemagen;
// Imports
///////////////
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,8 +34,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* <p>This test checks basic coverage of the options from schemagen: if more options are added,
@@ -70,8 +68,6 @@ public class SourceParameterTest
/* Static variables */
/***********************************/
- private static final Logger log = LoggerFactory.getLogger( SourceParameterTest.class );
-
/**
* @throws java.lang.Exception
*/
@@ -102,7 +98,7 @@ public class SourceParameterTest
/***********************************/
/**
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testGetOption() throws SchemagenOptionsConfigurationException {
Copied: jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceTest.java (from r1558331, jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SourceTest.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceTest.java?p2=jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceTest.java&p1=jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SourceTest.java&r1=1558331&r2=1558338&rev=1558338&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/test/java/org/openjena/tools/schemagen/SourceTest.java (original)
+++ jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceTest.java Wed Jan 15 10:43:03 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.tools.schemagen;
+package org.apache.jena.tools.schemagen;
// Imports
@@ -28,11 +28,7 @@ import java.util.List;
import jena.schemagen.SchemagenOptions.OPT;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.*;
/**
* <p>Additional unit test cases for {@link Source}, in addition
@@ -48,8 +44,6 @@ public class SourceTest
/* Static variables */
/***********************************/
- private static final Logger log = LoggerFactory.getLogger( SourceTest.class );
-
/***********************************/
/* Instance variables */
/***********************************/
@@ -72,20 +66,20 @@ public class SourceTest
/**
* Test method for {@link org.openjena.tools.schemagen.Source#setInput(java.lang.String)}.
- * @throws SchemagenOptionsConfigurationException
+ * @throws SchemagenOptionsConfigurationException
*/
@Test
public void testSetInput0() throws SchemagenOptionsConfigurationException {
- SchemagenOptions so = new SchemagenOptions(null, new Source());
+ SchemagenOptions so = new SchemagenOptions(null, new Source());
List<String> values = so.getAllValues( OPT.INPUT );
assertListMatch( new String[] {}, new String[] {}, 0, values );
}
@Test
public void testSetInput1() throws SchemagenOptionsConfigurationException {
- Source s = new Source();
+ Source s = new Source();
s.setInput( "__file1" );
- SchemagenOptions so = new SchemagenOptions(null, s);
+ SchemagenOptions so = new SchemagenOptions(null, s);
List<String> values = so.getAllValues( OPT.INPUT );
assertListMatch( new String[] {"__file1"}, new String[] {}, 1, values );
}
@@ -93,10 +87,10 @@ public class SourceTest
@Test
@Ignore //jena-maven-tools doesn't support multiple inputs as of now
public void testSetInput2() throws SchemagenOptionsConfigurationException {
- Source s = new Source();
+ Source s = new Source();
s.setInput( "__file1" );
s.setInput( "__file2" );
- SchemagenOptions so = new SchemagenOptions(null, s);
+ SchemagenOptions so = new SchemagenOptions(null, s);
List<String> values = so.getAllValues( OPT.INPUT );
assertListMatch( new String[] {"__file1", "__file2"}, new String[] {}, 2, values );
}