svn commit: r1706267 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-user/src: main/java/org/apache/uima/ducc/user/dgen/ main/java/org/apache/uima/ducc/user/dgen/iface/ test/java/org/apache/uima/ducc/use

[degenaro]

Author: degenaro
Date: Thu Oct  1 14:40:06 2015
New Revision: 1706267

URL: http://svn.apache.org/viewvc?rev=1706267=rev
Log:
UIMA-4624 DUCC uima-ducc-user project should not use duplicate class/interface 
names, to avoid confusion


Added:

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregate.java
  - copied, changed from r1706230, 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregateComponent.java
  - copied, changed from r1706230, 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaDeployableConfiguration.java
  - copied, changed from r1706230, 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaReferenceByName.java
  - copied, changed from r1706230, 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaReferenceByName.java
Removed:

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaReferenceByName.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IIdentity.java
Modified:

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaReferenceByName.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/DeployableGeneration.java

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java?rev=1706267=1706266=1706267=diff
==
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java
 Thu Oct  1 14:40:06 2015
@@ -52,25 +52,25 @@ public class DeployableGenerator {
userLogDir = value;
}

-   public String generate(IDuccUimaDeployableConfiguration configuration, 
String jobId) throws Exception {
+   public String generate(IDuccGeneratorUimaDeployableConfiguration 
configuration, String jobId) throws Exception {
String retVal = null;
if(configuration != null) {
-   if(configuration instanceof IDuccUimaReferenceByName) {
-   IDuccUimaReferenceByName 
referrenceByNameConfiguration = (IDuccUimaReferenceByName) configuration;
+   if(configuration instanceof 
IDuccGeneratorUimaReferenceByName) {
+   IDuccGeneratorUimaReferenceByName 
referrenceByNameConfiguration = (IDuccGeneratorUimaReferenceByName) 
configuration;
retVal = 
generateDd(referrenceByNameConfiguration, jobId);
}
-   else if(configuration instanceof IDuccUimaAggregate) {
-   IDuccUimaAggregate aggregateConfiguration = 
(IDuccUimaAggregate) configuration;
+   else if(configuration instanceof 
IDuccGeneratorUimaAggregate) {
+   IDuccGeneratorUimaAggregate 
aggregateConfiguration = (IDuccGeneratorUimaAggregate) configuration;
retVal = generateAe(aggregateConfiguration, 
jobId);
}
}
return 

svn commit: r1706252 - /uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml

[burn]

Author: burn
Date: Thu Oct  1 13:53:53 2015
New Revision: 1706252

URL: http://svn.apache.org/viewvc?rev=1706252=rev
Log:
UIMA-4608 Disable automatic svn update

Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml?rev=1706252=1706251=1706252=diff
==
--- uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml Thu Oct  1 13:53:53 
2015
@@ -693,27 +693,25 @@ ${uimaDUCCNoticeText}

 
 
-
-
-  org.codehaus.mojo
-  buildnumber-maven-plugin
-  1.3
-  
-
-  validate
-  
-create
-  
-
-  
-  
-false
-true
-  
-
-
-
-
+ 
+ 
+   org.codehaus.mojo
+   buildnumber-maven-plugin
+   1.3
+   
+ 
+   validate
+   
+ create
+   
+ 
+   
+   
+ false
+ false
+   
+ 
 

maven-compiler-plugin
@@ -738,7 +736,7 @@ ${uimaDUCCNoticeText}

${basedir}

${java.vendor}
Apache 
UIMA DUCC
-${buildNumber}
+   
${buildNumber}

svn commit: r1706294 - /uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml

[challngr]

Author: challngr
Date: Thu Oct  1 17:12:40 2015
New Revision: 1706294

URL: http://svn.apache.org/viewvc?rev=1706294=rev
Log:
UIMA-4627 Increase camel log level to warn.

Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml

Modified: uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml?rev=1706294=1706293=1706294=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml Thu Oct  1 
17:12:40 2015
@@ -250,11 +250,11 @@



- 
+ 

 

- 
+ 

 

svn commit: r1706300 - /uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/src/main/resources/log4j.xml

[burn]

Author: burn
Date: Thu Oct  1 18:11:03 2015
New Revision: 1706300

URL: http://svn.apache.org/viewvc?rev=1706300=rev
Log:
UIMA-4627 Increase camel log level to warn.

Modified:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/src/main/resources/log4j.xml

Modified: 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/src/main/resources/log4j.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/src/main/resources/log4j.xml?rev=1706300=1706299=1706300=diff
==
--- 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/src/main/resources/log4j.xml 
(original)
+++ 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/src/main/resources/log4j.xml 
Thu Oct  1 18:11:03 2015
@@ -203,7 +203,7 @@



- 
+