You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/09/23 22:57:25 UTC

svn commit: r818256 - in /incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor: ./ src/main/java/org/apache/uima/tools/cfe/ src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/ src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/impl/ src/...

Author: schor
Date: Wed Sep 23 20:57:24 2009
New Revision: 818256

URL: http://svn.apache.org/viewvc?rev=818256&view=rev
Log:
UIMA-1585 UIMA-1586 RAT fixes, and XML parser now generated sources

Removed:
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/BitsetFeatureValuesXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/CFEConfigDocument.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/CFEDescriptorXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/EnumFeatureValuesXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/FeatureObjectMatcherXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/GroupFeatureMatcherXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/ObjectPathFeatureValuesXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/PartialObjectMatcherXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/PatternFeatureValuesXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/RangeFeatureValuesXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/SingleFeatureMatcherXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/TargetAnnotationXML.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/xmlBeans/impl/
Modified:
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfig.xsd
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/cas_consumers/UIMAFeatureConsumer.xml
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/type_system/AppliedSenseAnnotation.xml

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt?rev=818256&r1=818255&r2=818256&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt Wed Sep 23 20:57:24 2009
@@ -1,3 +1,21 @@
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.  
+  
+    
 app-1.0.0-v20070423.jar
   org.eclipse.equinox groupId;
   no notice file;

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml?rev=818256&r1=818255&r2=818256&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml Wed Sep 23 20:57:24 2009
@@ -84,6 +84,22 @@
     </resources-->
 
     <plugins>
+
+      <!-- generate XML parser from .xsd file -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xmlbeans-maven-plugin</artifactId>
+        <version>2.3.3</version>
+        <executions>
+          <execution>
+            <goals><goal>xmlbeans</goal></goals>
+            <configuration>
+              <schemaDirectory>src/main/java/org/apache/uima/tools/cfe</schemaDirectory>
+            </configuration>        
+          </execution>
+        </executions>
+      </plugin>
+
       <!-- copy resources for the PEAR -->      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -130,6 +146,22 @@
         </execution></executions>
       </plugin>              
     
+      <!-- Release Audit Tool checks -->
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-cli</id>
+            <configuration>
+              <excludes>
+                <exclude>docs/html/images/*.svg</exclude> <!-- generated image files for docbook -->
+              </excludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
     </plugins>
 	</build>
 </project>

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfig.xsd
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfig.xsd?rev=818256&r1=818255&r2=818256&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfig.xsd (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfig.xsd Wed Sep 23 20:57:24 2009
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.apache.org/uima/tools/cfe/config" xmlns:tns="http://www.apache.org/uima/tools/cfe/config" elementFormDefault="qualified">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
+-->  
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+  targetNamespace="http://www.apache.org/uima/tools/cfe/config/XMLBeans" 
+        xmlns:tns="http://www.apache.org/uima/tools/cfe/config/XMLBeans"
+  elementFormDefault="qualified">
 
     <complexType name="SingleFeatureMatcherXML">
     	<choice>

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/cas_consumers/UIMAFeatureConsumer.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/cas_consumers/UIMAFeatureConsumer.xml?rev=818256&r1=818255&r2=818256&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/cas_consumers/UIMAFeatureConsumer.xml (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/cas_consumers/UIMAFeatureConsumer.xml Wed Sep 23 20:57:24 2009
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
+-->  
 <casConsumerDescription xmlns="http://uima.apache.org/resourceSpecifier">
   <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
   <implementationName>org.apache.uima.tools.cfe.UIMAFeatureConsumer</implementationName>

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/type_system/AppliedSenseAnnotation.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/type_system/AppliedSenseAnnotation.xml?rev=818256&r1=818255&r2=818256&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/type_system/AppliedSenseAnnotation.xml (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/resources/descriptors/type_system/AppliedSenseAnnotation.xml Wed Sep 23 20:57:24 2009
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
+-->  
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
   <name>AppliedSenseAnnotation</name>
   <description>Type system for UIMA Applier for WSD project</description>