svn commit: r1199239 - in /incubator/clerezza/trunk/parent/uima/uima.samples: pom.xml src/main/java/org/apache/clerezza/uima/samples/services/RegExAnnotatorAOService.java

[tommaso]

Author: tommaso
Date: Tue Nov  8 13:42:28 2011
New Revision: 1199239

URL: http://svn.apache.org/viewvc?rev=1199239&view=rev
Log:
[CLEREZZA-650] - fixed bundle build, param must be a FormParam, 
URL.openStream() is blocked by JavaSecurity permissions

Modified:
    incubator/clerezza/trunk/parent/uima/uima.samples/pom.xml
    
incubator/clerezza/trunk/parent/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/RegExAnnotatorAOService.java

Modified: incubator/clerezza/trunk/parent/uima/uima.samples/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.samples/pom.xml?rev=1199239&r1=1199238&r2=1199239&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/uima/uima.samples/pom.xml (original)
+++ incubator/clerezza/trunk/parent/uima/uima.samples/pom.xml Tue Nov  8 
13:42:28 2011
@@ -59,6 +59,22 @@
       <version>2.3.1</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.xmlbeans</groupId>
+      <artifactId>xmlbeans</artifactId>
+      <version>2.4.0</version>
+      <exclusions>
+        <exclusion> <!-- licensing issues, use geronimo instead -->
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.8.2</version>
@@ -73,11 +89,11 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>
-              
javax.ws.rs.*;org.apache.uima.*;org.apache.clerezza.*;org.apache.commons.io.*
-            </Import-Package>
+            
<Import-Package>javax.xml.*;org.xml.*;org.apache.xml.*;org.apache.tools.*;com.sun.*;org.w3c.dom.*;resolution:=optional,javax.ws.rs.*;org.apache.uima.*;org.apache.clerezza.*</Import-Package>
             <Export-Package>org.apache.clerezza.uima.samples.*</Export-Package>
             
<Bundle-Activator>org.apache.clerezza.uima.samples.UIMASamplesBundleActivator</Bundle-Activator>
+            
<Embed-Dependency>*;artifactId=commons-io|RegularExpressionAnnotator|xmlbeans|geronimo-stax-api_1.0_spec</Embed-Dependency>
+            <!--<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>-->
           </instructions>
         </configuration>
       </plugin>

Modified: 
incubator/clerezza/trunk/parent/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/RegExAnnotatorAOService.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/RegExAnnotatorAOService.java?rev=1199239&r1=1199238&r2=1199239&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/parent/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/RegExAnnotatorAOService.java
 (original)
+++ 
incubator/clerezza/trunk/parent/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/RegExAnnotatorAOService.java
 Tue Nov  8 13:42:28 2011
@@ -52,7 +52,7 @@ public class RegExAnnotatorAOService {
   @POST
   @Path("regex")
   @Produces("application/rdf+xml")
-  public Graph enrichUri(@QueryParam("uri") String uriString) {
+  public Graph enrichUri(@FormParam("uri") String uriString) {
     if (uriString == null || uriString.length() == 0)
       throw new WebApplicationException(Response.status(
               Response.Status.BAD_REQUEST).entity(new StringBuilder("No URI 
specified").toString()).build());
@@ -62,7 +62,7 @@ public class RegExAnnotatorAOService {
     parameters.put(OUTPUTGRAPH, uriString);
     try {
       URL url = URI.create(uriString).toURL();
-      String text = IOUtils.toString(url.openStream());
+      String text = IOUtils.toString(url.openConnection().getInputStream());
       executor.analyzeDocument(text, new 
XMLInputSource(getClass().getResource(PATH)), parameters);
     } catch (Exception e) {
       e.printStackTrace();