clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [45/51] [partial] clerezza git commit: CLEREZZA-1012: reduced clerezza to core components, the rest stays in legacy-branch
Date Mon, 03 Oct 2016 15:50:11 GMT
http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.utils/src/main/java/org/apache/clerezza/jaxrs/utils/form/ParameterValue.java
----------------------------------------------------------------------
diff --git a/jaxrs.utils/src/main/java/org/apache/clerezza/jaxrs/utils/form/ParameterValue.java b/jaxrs.utils/src/main/java/org/apache/clerezza/jaxrs/utils/form/ParameterValue.java
deleted file mode 100644
index 17a54ee..0000000
--- a/jaxrs.utils/src/main/java/org/apache/clerezza/jaxrs/utils/form/ParameterValue.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright  2002-2006 WYMIWYG (http://wymiwyg.org)
- *
- *  Licensed 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.
- *
- */
-package org.apache.clerezza.jaxrs.utils.form;
-
-/**
- * Represents a parameter-value. A textual parameter-value is guaranteed to have
- * the text as its toSTring-representation
- * 
- * @author reto
- * 
- */
-public interface ParameterValue {
-
-    /**
-     * @return the String-value of the paramter, for text-values this is the
-     *         text
-     */
-    public String toString();
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.utils/src/main/java/org/apache/clerezza/jaxrs/utils/form/StringParameterValue.java
----------------------------------------------------------------------
diff --git a/jaxrs.utils/src/main/java/org/apache/clerezza/jaxrs/utils/form/StringParameterValue.java b/jaxrs.utils/src/main/java/org/apache/clerezza/jaxrs/utils/form/StringParameterValue.java
deleted file mode 100644
index 5b908bf..0000000
--- a/jaxrs.utils/src/main/java/org/apache/clerezza/jaxrs/utils/form/StringParameterValue.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.clerezza.jaxrs.utils.form;
-/*
- *
- * 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.
- *
-*/
-
-
-/**
- * @author reto
- * 
- */
-public class StringParameterValue implements ParameterValue {
-
-    private String value;
-
-    /**
-     * @param value
-     *            the value of this parameter
-     */
-    public StringParameterValue(String value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/JSONObjectMessageBodyWriterTest.java
----------------------------------------------------------------------
diff --git a/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/JSONObjectMessageBodyWriterTest.java b/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/JSONObjectMessageBodyWriterTest.java
deleted file mode 100644
index eac565f..0000000
--- a/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/JSONObjectMessageBodyWriterTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.jaxrs.utils;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import org.apache.clerezza.jaxrs.testutils.TestWebServer;
-import org.json.simple.JSONObject;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- *
- * @author hasan
- */
-public class JSONObjectMessageBodyWriterTest {
-
-    @Path("/foo")
-    public class MyResource {
-
-        @Path("bar")
-        @GET
-        public JSONObject myMethod(@QueryParam("name") String name){
-            JSONObject obj = new JSONObject();
-            obj.put("name", JSONObject.escape(name));
-            return obj;
-        }
-    }
-
-    @Test
-    public void testMbwWithoutUmlaut() throws IOException {
-        testMbw("foobar");
-    }
-
-//CLEREZZA-681: Disabled test because it fails on the Jenkins Build Server. 
-//See https://issues.apache.org/jira/browse/CLEREZZA-681
-//    @Test
-//    public void testMbwWithUmlaut() throws IOException {
-//        testMbw("foob\u00E4r"); // foobär
-//    }
-
-    private void testMbw(String param) throws IOException {
-        final TestWebServer testWebServer = createTestWebServer(new MyResource());
-        int port = testWebServer.getPort();
-        URL serverURL = new URL("http://localhost:" + port + "/foo/bar?name=" + param);
-        HttpURLConnection connection = (HttpURLConnection) serverURL.openConnection();
-        connection.setRequestMethod("GET");
-        connection.addRequestProperty("Accept", "application/json, */*; q=.2");
-        BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
-        String line = br.readLine();
-//        System.out.println(line);
-        Assert.assertEquals("{\"name\":\""+param+"\"}", line);
-        testWebServer.stop();
-    }
-
-    private TestWebServer createTestWebServer(final Object resource) {
-        return new TestWebServer(new Application() {
-
-            @Override
-            public Set<Class<?>> getClasses() {
-                Set<Class<?>> result = new HashSet<Class<?>>();
-                return result;
-            }
-
-            @Override
-            public Set<Object> getSingletons() {
-                Set<Object> result = new HashSet<Object>();
-                result.add(resource);
-                result.add(new JSONObjectMessageBodyWriter());
-                return result;
-            }
-        });
-    }
-
-//CLEREZZA-681: Disabled test because it fails on the Jenkins Build Server. 
-//See https://issues.apache.org/jira/browse/CLEREZZA-681
-//    @Test
-    public void testWriteToAndGetSizeWithUmlaut() throws Exception {
-        testWriteToAndGetSize("foob\u00E4r"); // foobär
-    }
-
-    @Test
-    public void testWriteToAndGetSizeWithoutUmlaut() throws Exception {
-        testWriteToAndGetSize("foobar");
-    }
-
-    private void testWriteToAndGetSize(String name) throws Exception {
-        JSONObject value = new JSONObject();
-        value.put("name", JSONObject.escape(name));
-        Class<?> type = null;
-        Type genericType = null;
-        Annotation[] annotations = null;
-        MediaType mediaType = null;
-        MultivaluedMap<String, Object> httpHeaders = null;
-
-        OutputStream out = new ByteArrayOutputStream();
-        JSONObjectMessageBodyWriter instance = new JSONObjectMessageBodyWriter();
-        long size = instance.getSize(value, type, genericType, annotations, mediaType);
-//        System.out.println(size);
-        instance.writeTo(value, type, genericType, annotations, mediaType, httpHeaders, out);
-        long len = out.toString().getBytes("UTF-8").length;
-//        System.out.println(out.toString());
-//        System.out.println(len);
-        Assert.assertEquals(size, len);
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java
----------------------------------------------------------------------
diff --git a/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java b/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java
deleted file mode 100644
index 9f42b16..0000000
--- a/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.jaxrs.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Arrays;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.RuntimeDelegate;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.apache.clerezza.jaxrs.utils.form.FormFile;
-import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
-import org.apache.clerezza.jaxrs.utils.form.MultiPartFormMessageBodyReader;
-
-/**
- * @author mir
- * 
- */
-public class MultiPartFormMBRTest {
-    
-    private static String paramName1 = "field1";
-    private static String paramName2 = "field2";
-    private static String paramName3 = "userfile";
-    private static String field1Value = "foo";
-    private static String field2Value = "bar";
-    private static String binaryData = "010111100\n100110101\n001100101";
-    private static String binaryMimeType = "application/octet-stream";
-    private static String binaryFilename = "example.bin";
-    
-    @Test
-    public void testMultiPartForm() throws Exception {
-        
-        //RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
-        StringBuilder sb = new StringBuilder();
-        sb.append("--AaB03x\r\n");
-        sb.append("Content-Disposition: form-data; name=\""+ paramName1 +"\"\r\n");
-        sb.append("\r\n");
-        sb.append(field1Value + "\r\n");
-        sb.append("--AaB03x\r\n");
-        sb.append("Content-Disposition: form-data; name=\""+ paramName2 +"\"\r\n");
-        sb.append("\r\n");
-        sb.append(field2Value +"\r\n");
-        sb.append("--AaB03x\r\n");
-        sb.append("Content-Disposition: form-data; name=\"userfile\"; filename=\""+ binaryFilename +"\"\r\n");
-        sb.append("Content-Type: "+ binaryMimeType +"\r\n");
-        sb.append("Content-Transfer-Encoding: binary\r\n");
-        sb.append("\r\n");
-        sb.append(binaryData + "\r\n");
-        sb.append("--AaB03x--\r\n");
-
-        final byte[] message = sb.toString().getBytes();
-        InputStream entityStream = new ByteArrayInputStream(message);
-        
-        MultiPartFormMessageBodyReader multiPartFormMBR = new MultiPartFormMessageBodyReader();
-        MediaType mediaType = MediaType.valueOf("multipart/form-data; boundary=AaB03x");
-        
-        MultiPartBody multiPartBody = multiPartFormMBR.readFrom(null, null, null, mediaType, null, entityStream);
-        
-        String[] paramNames = multiPartBody.getParameterNames();
-        String[] expectedParamNames = {paramName1, paramName2, paramName3};
-        System.out.println(Arrays.toString(paramNames));
-        Assert.assertArrayEquals(expectedParamNames, paramNames);
-        Assert.assertEquals(field1Value, multiPartBody.getParameteValues(paramName1)[0].toString());
-        Assert.assertEquals(field2Value, multiPartBody.getParameteValues(paramName2)[0].toString());
-        
-        String[] fileParamNames = multiPartBody.getFileParameterNames();            
-        String[] expectedFileParamNames = {paramName3};
-        Assert.assertArrayEquals(expectedFileParamNames, fileParamNames);
-        FormFile[] formFiles = multiPartBody.getFormFileParameterValues(paramName3);
-        Assert.assertArrayEquals(binaryData.getBytes(), formFiles[0].getContent());
-        Assert.assertEquals(MediaType.valueOf(binaryMimeType), formFiles[0].getMediaType());
-        Assert.assertEquals(binaryFilename, formFiles[0].getFileName());
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/TrailingSlashTest.java
----------------------------------------------------------------------
diff --git a/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/TrailingSlashTest.java b/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/TrailingSlashTest.java
deleted file mode 100644
index 5c08fd5..0000000
--- a/jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/TrailingSlashTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.jaxrs.utils;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.apache.clerezza.jaxrs.testutils.TestWebServer;
-
-/**
- * @author mir
- *
- */
-public class TrailingSlashTest {
-
-    private String path;
-    
-    @Path("/foo")
-    public class MyResource {
-        
-        @Path("bar")
-        @GET
-        public void myMethod(@Context UriInfo uriInfo){
-            TrailingSlash.enforcePresent(uriInfo);
-            path = uriInfo.getAbsolutePath().toString();
-        }
-    }
-    
-    @Path("/one")
-    public class MyResource2 {
-        
-        @Path("two")
-        @GET
-        public void myMethod(@Context UriInfo uriInfo){
-            TrailingSlash.enforceNotPresent(uriInfo);
-            path = uriInfo.getAbsolutePath().toString();
-        }
-    }    
-    
-    @Test
-    public void testEnforceSlash() throws IOException {        
-        final TestWebServer testWebServer = createTestWebServer(new MyResource());
-        int port = testWebServer.getPort();
-        URL serverURL = new URL("http://localhost:" + port + "/foo/bar");
-        HttpURLConnection connection = (HttpURLConnection) serverURL.openConnection();
-        connection = (HttpURLConnection) serverURL.openConnection();
-        connection.setRequestMethod("GET");
-        connection.addRequestProperty("Accept", "text/html, */*; q=.2");    
-        Assert.assertEquals(204, connection.getResponseCode());
-        Assert.assertTrue(path.endsWith("/"));
-        testWebServer.stop();
-    }
-    
-    @Test
-    public void testEnforceNoSlash() throws IOException {
-        final TestWebServer testWebServer = createTestWebServer(new MyResource2());
-        int port = testWebServer.getPort();
-        URL serverURL = new URL("http://localhost:" + port + "/one/two/");
-        HttpURLConnection connection = (HttpURLConnection) serverURL.openConnection();
-        connection = (HttpURLConnection) serverURL.openConnection();
-        connection.setRequestMethod("GET");
-
-        connection.addRequestProperty("Accept", "text/html, */*; q=.2");
-        Assert.assertEquals(204, connection.getResponseCode());
-        Assert.assertFalse(path.endsWith("/"));
-        testWebServer.stop();
-    }
-    
-    
-    private TestWebServer createTestWebServer(final Object resource) {
-        return new TestWebServer(new Application() {
-
-            @Override
-            public Set<Class<?>> getClasses() {
-                Set<Class<?>> result = new HashSet<Class<?>>();
-                return result;
-            }
-            
-            @Override
-            public Set<Object> getSingletons() {
-                Set<Object> result = new HashSet<Object>();
-                result.add(resource);
-                return result;
-            }
-        });
-    }
-
-    
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.whiteboard.jersey/pom.xml
----------------------------------------------------------------------
diff --git a/jaxrs.whiteboard.jersey/pom.xml b/jaxrs.whiteboard.jersey/pom.xml
deleted file mode 100644
index 667835b..0000000
--- a/jaxrs.whiteboard.jersey/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>7</version>
-        <relativePath>../parent</relativePath>
-    </parent>    
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>jaxrs.whiteboard.jersey</artifactId>
-    <version>1.0.0</version>
-    <packaging>bundle</packaging>
-
-
-
-    <name>Clerezza JAX-RS Whiteboard Jersey</name>
-    <description>Providing JAX-RS OSGi Whiteboard registration of components.</description>
-    <licenses>
-        <license>
-            <name>Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-            <comments>A business-friendly OSS license</comments>
-        </license>
-    </licenses>
-    
-
-    <build>
-        <!-- make it an OSGi bundle -->
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Private-Package>
-                            org.apache.clerezza.jaxrs.whiteboard.jersey;version=${project.version}
-                        </Private-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>  
-        <!-- Jersey -->
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>2.19</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <!-- if your container implements Servlet API older than 3.0, 
-            use "jersey-container-servlet-core", otherwise
-            "jersey-container-servlet"        -->
-            <artifactId>jersey-container-servlet-core</artifactId>
-            <version>2.21</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-    
-        <!-- OSGi tax -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-        </dependency>
-        <!-- for tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-
-  <scm>
-    <tag>201508-1</tag>
-  </scm>
-</project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.whiteboard.jersey/src/license/THIRD-PARTY.properties
----------------------------------------------------------------------
diff --git a/jaxrs.whiteboard.jersey/src/license/THIRD-PARTY.properties b/jaxrs.whiteboard.jersey/src/license/THIRD-PARTY.properties
deleted file mode 100644
index 6294042..0000000
--- a/jaxrs.whiteboard.jersey/src/license/THIRD-PARTY.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
-#-------------------------------------------------------------------------------
-# Already used licenses in project :
-# - Apache Software License
-# - Apache Software License, Version 2.0
-# - BSD License
-# - Common Development And Distribution License (CDDL), Version 1.0
-# - Common Development And Distribution License (CDDL), Version 1.1
-# - Common Public License, Version 1.0
-# - Eclipse Public License, Version 1.0
-# - GNU General Public License (GPL), Version 2 with classpath exception
-# - GNU Lesser General Public License (LGPL)
-# - GNU Lesser General Public License (LGPL), Version 2.1
-# - ICU License
-# - MIT License
-# - New BSD License
-# - Public Domain License
-#-------------------------------------------------------------------------------
-# Please fill the missing licenses for dependencies :
-#
-#
-#Thu Dec 13 13:41:05 CET 2012
-asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
-org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
-org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
-org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
-xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.whiteboard.jersey/src/main/java/org/apache/clerezza/jaxrs/whiteboard/jersey/DefaultApplication.java
----------------------------------------------------------------------
diff --git a/jaxrs.whiteboard.jersey/src/main/java/org/apache/clerezza/jaxrs/whiteboard/jersey/DefaultApplication.java b/jaxrs.whiteboard.jersey/src/main/java/org/apache/clerezza/jaxrs/whiteboard/jersey/DefaultApplication.java
deleted file mode 100644
index 535fdeb..0000000
--- a/jaxrs.whiteboard.jersey/src/main/java/org/apache/clerezza/jaxrs/whiteboard/jersey/DefaultApplication.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* 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.
-*/
-package org.apache.clerezza.jaxrs.whiteboard.jersey;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.ws.rs.core.Application;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Define the list of available resources and providers to be used by the Stanbol JAX-RS Endpoint.
- */
-public class DefaultApplication extends Application {
-
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(DefaultApplication.class);
-
-    protected final Set<Class<?>> contributedClasses = new HashSet<Class<?>>();
-
-    protected final Set<Object> contributedSingletons = new HashSet<Object>();
-
-
-    @Override
-    public Set<Class<?>> getClasses() {
-        Set<Class<?>> classes = new HashSet<Class<?>>();
-        // resources contributed buy other bundles
-        classes.addAll(contributedClasses);
-        //TODO check if clerezza rdf.jaxrs prvoder fits the purpose
-        // message body writers, hard-coded for now
-        //classes.add(GraphWriter.class);
-        //classes.add(JenaModelWriter.class);
-        //classes.add(ResultSetWriter.class);
-        return classes;
-    }
-
-    @Override
-    public Set<Object> getSingletons() {
-        Set<Object> singletons = new HashSet<Object>();
-        singletons.addAll(contributedSingletons);
-        return singletons;
-    }
-
-    public void contributeClasses(Set<Class<?>> classes) {
-        contributedClasses.addAll(classes);
-    }
-
-    public void contributeSingletons(Set<Object> singletons) {
-        contributedSingletons.addAll(singletons);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.whiteboard.jersey/src/main/java/org/apache/clerezza/jaxrs/whiteboard/jersey/JerseyEndpoint.java
----------------------------------------------------------------------
diff --git a/jaxrs.whiteboard.jersey/src/main/java/org/apache/clerezza/jaxrs/whiteboard/jersey/JerseyEndpoint.java b/jaxrs.whiteboard.jersey/src/main/java/org/apache/clerezza/jaxrs/whiteboard/jersey/JerseyEndpoint.java
deleted file mode 100644
index b0364a5..0000000
--- a/jaxrs.whiteboard.jersey/src/main/java/org/apache/clerezza/jaxrs/whiteboard/jersey/JerseyEndpoint.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.jaxrs.whiteboard.jersey;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.ReferencePolicyOption;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.cm.ConfigurationException;
-import org.osgi.service.component.ComponentContext;
-import org.osgi.service.http.HttpService;
-import org.osgi.service.http.NamespaceException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-import org.apache.felix.scr.annotations.References;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.servlet.ServletContainer;
-
-/**
- * Jersey-based JAXRS whiteboard implementation.
- * 
- * This exposes JAX-RS resources available as services exposing Object with the property javax.ws.rs=true
- */
-@Component(immediate = true, metatype = true)
-@References({
-    @Reference(name="component", referenceInterface=Object.class, 
-        target="(javax.ws.rs=true)", 
-		cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE, 
-        policy=ReferencePolicy.STATIC,
-        policyOption=ReferencePolicyOption.GREEDY)})
-public class JerseyEndpoint {
-
-    private final Logger log = LoggerFactory.getLogger(getClass());
-
-    @Property(value = "/")
-    public static final String ALIAS_PROPERTY = "org.apache.stanbol.commons.web.alias";
-
-    @Property(value = "/static")
-    public static final String STATIC_RESOURCES_URL_ROOT_PROPERTY = "org.apache.stanbol.commons.web.static.url";
-    
-    @Reference
-    HttpService httpService;
-
-    protected ComponentContext componentContext;
-
-    protected ServletContext servletContext;
-
-
-    protected final List<String> registeredAliases = new ArrayList<String>();
-
-    protected Set<String> exposedHeaders;
-    private Set<Object> components = new HashSet<Object>();
-
-    public Dictionary<String,String> getInitParams() {
-        Dictionary<String,String> initParams = new Hashtable<String,String>();
-        // make jersey automatically turn resources into Viewable models and
-        // hence lookup matching freemarker templates
-        initParams.put("com.sun.jersey.config.feature.ImplicitViewables", "true");
-        return initParams;
-    }
-
-    @Activate
-    protected void activate(ComponentContext componentContext) throws IOException,
-                                                 ServletException,
-                                                 NamespaceException,
-                                                 ConfigurationException {
-
-        log.info("Activating Jersey subsystem");
-
-        // register all the JAX-RS resources into a a JAX-RS application and bind it to a configurable URL
-        // prefix
-        DefaultApplication app = new DefaultApplication();
-        String applicationAlias = (String) componentContext.getProperties().get(ALIAS_PROPERTY);
-
-        app.contributeSingletons(components);
-
-        // bind the aggregate JAX-RS application to a dedicated servlet
-        ServletContainer container = new ServletContainer(
-                ResourceConfig.forApplication(app));
-        httpService.registerServlet(applicationAlias, container, getInitParams(), null);
-        registeredAliases.add(applicationAlias);
-
-        // forward the main Stanbol OSGi runtime context so that JAX-RS resources can lookup arbitrary
-        // services
-        servletContext = container.getServletContext();
-        servletContext.setAttribute(BundleContext.class.getName(), componentContext.getBundleContext());
-        log.info("JerseyEndpoint servlet registered at {}", applicationAlias);
-    }
-
-    /** Shutdown Jersey, if there's anything to do */
-    private synchronized void shutdownJersey() {
-        log.debug("Unregistering aliases {}", registeredAliases);
-        for (String alias : registeredAliases) {
-            httpService.unregister(alias);
-        }
-        registeredAliases.clear();
-    }
-
-    @Deactivate
-    protected void deactivate(ComponentContext ctx) {
-        shutdownJersey();
-        servletContext = null;
-    }
-    
-    protected void bindComponent(Object component) throws IOException,
-                                                          ServletException,
-                                                          NamespaceException  {
-        components.add(component);
-    }
-
-    protected void unbindComponent(Object component) throws IOException,
-                                                          ServletException,
-                                                          NamespaceException  {
-        components.remove(component);
-    }    
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/jaxrs.whiteboard.jersey/src/main/resources/OSGI-INF/metatype/metatype.properties
----------------------------------------------------------------------
diff --git a/jaxrs.whiteboard.jersey/src/main/resources/OSGI-INF/metatype/metatype.properties b/jaxrs.whiteboard.jersey/src/main/resources/OSGI-INF/metatype/metatype.properties
deleted file mode 100644
index 2ea7a1a..0000000
--- a/jaxrs.whiteboard.jersey/src/main/resources/OSGI-INF/metatype/metatype.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.
-
-#===============================================================================
-#Properties and Options used to configure 
-#===============================================================================
-
-org.apache.stanbol.commons.web.base.jersey.JerseyEndpoint.name=Apache Stanbol Web Application
-org.apache.stanbol.commons.web.base.jersey.JerseyEndpoint.description=The main Apache Stanbol Web Endpoint where all the different modules (Enhancer, Entityhub, ...) register itself.
-
-
-org.apache.stanbol.commons.web.alias.name=Alias
-org.apache.stanbol.commons.web.alias.description=The Alias for the Stanbol Web Application
-
-org.apache.stanbol.commons.web.static.url.name=Static
-org.apache.stanbol.commons.web.static.url.description=The path to the static resources
-
-org.apache.stanbol.commons.web.cors.origin.name=CORS origins
-org.apache.stanbol.commons.web.cors.origin.description=The CORS origins: This list defines the hosts content returned by Stanbol supports multi-site-scripting. Add '*' to allow any domain. Note: As soon as '*' is added all the other restrictions are ignored.
-
-org.apache.stanbol.commons.web.cors.access_control_expose_headers.name=CORS Access-Control-Expose-Headers
-org.apache.stanbol.commons.web.cors.access_control_expose_headers.description=This is a list containing the headers whose values to be accessed through the XMLHttpRequest instance in Java Script.   
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-archetypes/java-ssp-ttl/core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/java-ssp-ttl/core/pom.xml b/maven-archetypes/java-ssp-ttl/core/pom.xml
deleted file mode 100644
index caf49ed..0000000
--- a/maven-archetypes/java-ssp-ttl/core/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
-        <artifactId>parent</artifactId>
-        <version>0.1-SNAPSHOT</version>
-        <relativePath>../../../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
-    <artifactId>core</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Skeleton Core</name>
-    <description>
-        Skeleton Core
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
-            <artifactId>ontologies</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>jaxrs.utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.graphprovider.content</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typerendering.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typerendering.scalaserverpages</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>web.fileserver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingManager.java
----------------------------------------------------------------------
diff --git a/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingManager.java b/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingManager.java
deleted file mode 100644
index 4087ad9..0000000
--- a/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingManager.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.clerezza.skeleton;
-
-import java.net.URISyntaxException;
-import java.util.concurrent.locks.Lock;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import org.apache.clerezza.jaxrs.utils.RedirectUtil;
-import org.apache.clerezza.jaxrs.utils.TrailingSlash;
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
-import org.apache.clerezza.platform.typerendering.RenderletManager;
-import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.LockableMGraph;
-import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.clerezza.skeleton.ontologies.GREETINGS;
-import org.apache.clerezza.web.fileserver.FileServer;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-import org.osgi.service.component.ComponentContext;
-
-
-
-@Component
-@Service(value=Object.class)
-@Property(name="javax.ws.rs", boolValue=true)
-@Path("/greeting/manager")
-public class GreetingManager extends FileServer {
-
-    @Reference
-    private RenderletManager renderletManager;
-
-    @Reference
-    private ContentGraphProvider cgProvider;
-
-    public void activate(ComponentContext context) throws URISyntaxException {
-        renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
-                new UriRef(getClass().getResource(
-                "greeting-naked.ssp").toURI().toString()),
-                GREETINGS.Greeting, "naked",
-                MediaType.APPLICATION_XHTML_XML_TYPE, true);
-        configure(context.getBundleContext());
-    }
-
-    @GET
-    public Response entry(@Context UriInfo uriInfo) {
-        TrailingSlash.enforceNotPresent(uriInfo);
-        return RedirectUtil.createSeeOtherResponse("manager/new-greeting.xhtml", uriInfo);
-    }
-
-    @GET
-    @Path("test")
-    public GraphNode testGreeting() {
-        MGraph resultMGraph = new SimpleMGraph();
-        GraphNode result = new GraphNode(new BNode(), resultMGraph);
-        result.addProperty(RDF.type, GREETINGS.Greeting);
-        result.addProperty(GREETINGS.words, 
-                new PlainLiteralImpl("Merhaba!"));
-        return result;
-    }
-
-    @POST
-    @Path("new-greeting")
-    public String createNewGreeting(@FormParam("uri") UriRef uri,
-            @FormParam("words") String words) {
-        LockableMGraph contentGraph = cgProvider.getContentGraph();
-        Lock l = contentGraph.getLock().writeLock();
-        l.lock();
-        try {
-            contentGraph.add(new TripleImpl(uri, RDF.type, GREETINGS.Greeting));
-            contentGraph.add(new TripleImpl(uri, GREETINGS.words,
-                    new PlainLiteralImpl(words)));
-        } finally {
-            l.unlock();
-        }
-        return "created";
-    }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingsList.java
----------------------------------------------------------------------
diff --git a/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingsList.java b/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingsList.java
deleted file mode 100644
index 863e2a9..0000000
--- a/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingsList.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.clerezza.skeleton;
-
-import java.net.URISyntaxException;
-import java.util.Iterator;
-import java.util.concurrent.locks.Lock;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import org.apache.clerezza.jaxrs.utils.RedirectUtil;
-import org.apache.clerezza.jaxrs.utils.TrailingSlash;
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
-import org.apache.clerezza.platform.typerendering.RenderletManager;
-import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.LockableMGraph;
-import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.clerezza.rdf.utils.RdfList;
-import org.apache.clerezza.skeleton.ontologies.GREETINGS;
-import org.apache.clerezza.web.fileserver.FileServer;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-import org.osgi.service.component.ComponentContext;
-
-
-
-@Component
-@Service(value=Object.class)
-@Property(name="javax.ws.rs", boolValue=true)
-@Path("/greeting/list")
-public class GreetingsList {
-
-    @Reference
-    private RenderletManager renderletManager;
-
-    @Reference
-    private ContentGraphProvider cgProvider;
-
-    public void activate(ComponentContext context) throws URISyntaxException {
-        renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
-                new UriRef(getClass().getResource(
-                "greeting-list-naked.ssp").toURI().toString()),
-                GREETINGS.GreetingList, "naked",
-                MediaType.APPLICATION_XHTML_XML_TYPE, true);
-    }
-
-    @GET
-    public GraphNode list() {
-        TripleCollection resultGraph = new SimpleMGraph();
-        GraphNode result = new GraphNode(new BNode(), resultGraph);
-        RdfList list = new RdfList(result);
-        LockableMGraph contentGraph = cgProvider.getContentGraph();
-        Lock l = contentGraph.getLock().readLock();
-        l.lock();
-        try {
-            Iterator<Triple> greetings = contentGraph.filter(null, RDF.type, GREETINGS.Greeting);
-            while (greetings.hasNext()) {
-                list.add(greetings.next().getSubject());
-            }
-        } finally {
-            l.unlock();
-        }
-        result.addProperty(RDF.type, GREETINGS.GreetingList);
-        return result;
-    }
-
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-list-naked.ssp
----------------------------------------------------------------------
diff --git a/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-list-naked.ssp b/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-list-naked.ssp
deleted file mode 100644
index 55795be..0000000
--- a/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-list-naked.ssp
+++ /dev/null
@@ -1,6 +0,0 @@
-def greet(s: Any) = new UriRef("http://clerezza.apache.org/skeleton/greeting#" + s)
-
-<div class="tx-content">
-	<h3>The following greetings are available:</h3>
-	<strong>{for (greeting <- res!!) yield <a href={greeting*}>{greeting*}</a><br/>} </strong>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-naked.ssp
----------------------------------------------------------------------
diff --git a/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-naked.ssp b/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-naked.ssp
deleted file mode 100644
index 6e57fbf..0000000
--- a/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-naked.ssp
+++ /dev/null
@@ -1,6 +0,0 @@
-def greet(s: Any) = new UriRef("http://clerezza.apache.org/skeleton/greeting#" + s)
-
-<div class="tx-content">
-	<h3>Today we greet you as follows:</h3>
-	<strong>{res/greet("words")*}</strong>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/new-greeting.xhtml
----------------------------------------------------------------------
diff --git a/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/new-greeting.xhtml b/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/new-greeting.xhtml
deleted file mode 100644
index 8f149f1..0000000
--- a/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/new-greeting.xhtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>Create a new Greeting</title>
-    </head>
-    <body>
-		<div class="tx-content">
-			<h1>Create new Greeting</h1>
-			<form method="post" action="new-greeting">
-				Uri: <input type="text" name="uri"/><br/>
-				Words: <input type="text" name="words"/><br/>
-				<input type="submit"/>
-			</form>
-		</div>
-    </body>
-</html>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-archetypes/java-ssp-ttl/ontologies/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/java-ssp-ttl/ontologies/pom.xml b/maven-archetypes/java-ssp-ttl/ontologies/pom.xml
deleted file mode 100644
index 3eb5f42..0000000
--- a/maven-archetypes/java-ssp-ttl/ontologies/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
-        <artifactId>parent</artifactId>
-        <version>0.1-SNAPSHOT</version>
-        <relativePath>../../../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
-    <artifactId>ontologies</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Skeleton Ontologies</name>
-    <description>
-        Skeleton Ontologies
-    </description>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core</artifactId>
-            <version>0.13-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.clerezza</groupId>
-                <artifactId>maven-ontologies-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <resourcePath>${basedir}/src/main/resources</resourcePath>
-                            <sources>
-                                <source>${basedir}/target/generated-sources/main/java</source>
-                            </sources>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <version>0.4-SNAPSHOT</version>
-        </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/greetings.ttl
----------------------------------------------------------------------
diff --git a/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/greetings.ttl b/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/greetings.ttl
deleted file mode 100644
index 94bdc94..0000000
--- a/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/greetings.ttl
+++ /dev/null
@@ -1,19 +0,0 @@
-@prefix : <http://clerezza.apache.org/skeleton/greeting#>.
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
-@prefix skos: <http://www.w3.org/2008/05/skos#>.
-@prefix owl: <http://www.w3.org/2002/07/owl#>.
-
-
-: a owl:Ontology.
-
-:Greeting a rdfs:Class;
-	skos:definition "A greeting."@en.
-
-:words a rdf:Property;
-	skos:definition "A sequence of word expressing the subject."@en;
-	rdfs:Domain :Greeting.
-
-:GreetingList a rdfs:Class;
-	skos:definition "A List of Greetings"@en;
-	rdfs:subClassOf rdf:List.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-archetypes/java-ssp-ttl/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/java-ssp-ttl/pom.xml b/maven-archetypes/java-ssp-ttl/pom.xml
deleted file mode 100644
index 34a6a33..0000000
--- a/maven-archetypes/java-ssp-ttl/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>0.2-incubating</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
-    <artifactId>parent</artifactId>
-    <packaging>pom</packaging>
-    <version>0.1-SNAPSHOT</version>
-    <name>Clerezza - Skeleton for a project using Java, ScalaServerPages and Turtle</name>
-    <modules>
-        <module>ontologies</module>
-        <module>core</module>
-    </modules>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
-                <artifactId>ontologies</artifactId>
-                <version>0.1-SNAPSHOT</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <!-- <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.archetype</groupId>
-                    <artifactId>archetype-packaging:maven-plugin</artifactId>
-                    <version>2.0-alpha-5</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build> -->
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-jaxrs-report-plugin/LICENSE
----------------------------------------------------------------------
diff --git a/maven-jaxrs-report-plugin/LICENSE b/maven-jaxrs-report-plugin/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/maven-jaxrs-report-plugin/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-jaxrs-report-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-jaxrs-report-plugin/pom.xml b/maven-jaxrs-report-plugin/pom.xml
deleted file mode 100644
index a8979f7..0000000
--- a/maven-jaxrs-report-plugin/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
-
- 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.
-
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>clerezza</artifactId>
-        <groupId>org.apache.clerezza</groupId>
-        <version>0.5</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>maven-jaxrs-report-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
-    <version>0.2-SNAPSHOT</version>
-    <name>Clerezza - Maven JaxRs Report Plugin</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.reporting</groupId>
-            <artifactId>maven-reporting-api</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.reporting</groupId>
-            <artifactId>maven-reporting-impl</artifactId>
-            <version>2.0</version>
-        </dependency>
-         <!-- JavaDoc Tags -->
-        <dependency>
-            <groupId>com.thoughtworks.qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <version>1.9.1</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </reporting>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/maven-jaxrs-report-plugin/src/main/java/org/apache/clerezza/jaxrsreportplugin/JaxRsReportMojo.java
----------------------------------------------------------------------
diff --git a/maven-jaxrs-report-plugin/src/main/java/org/apache/clerezza/jaxrsreportplugin/JaxRsReportMojo.java b/maven-jaxrs-report-plugin/src/main/java/org/apache/clerezza/jaxrsreportplugin/JaxRsReportMojo.java
deleted file mode 100644
index dc755af..0000000
--- a/maven-jaxrs-report-plugin/src/main/java/org/apache/clerezza/jaxrsreportplugin/JaxRsReportMojo.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.jaxrsreportplugin;
-
-import com.thoughtworks.qdox.JavaDocBuilder;
-import com.thoughtworks.qdox.model.AbstractBaseJavaEntity;
-import com.thoughtworks.qdox.model.Annotation;
-import com.thoughtworks.qdox.model.DocletTag;
-import com.thoughtworks.qdox.model.JavaClass;
-import com.thoughtworks.qdox.model.JavaMethod;
-import com.thoughtworks.qdox.model.JavaSource;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.AbstractMavenReport;
-import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
-
-/**
- * Generates a report about jaxrs resources. The report includes java doc descriptions
- * about paths, http methods, comments and parameters of the methods. The report
- * will be generated in the site phase, the default goal is jaxrs-report.
- * 
- * 
- * @goal jaxrs-report
- * 
- * @phase site
- */
-public class JaxRsReportMojo extends AbstractMavenReport {
-
-    /**
-     * Path to the root directory
-     *
-     * @parameter expression="${basedir}"
-     */
-    private String baseDir;
-    /**
-     * Location where generated html will be created.
-     *
-     * @parameter expression="${project.reporting.outputDirectory}"
-     */
-    private String outputDirectory;
-    /**
-     * Doxia Site Renderer
-     *
-     * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}"
-     * @required @readonly
-     */
-    private SiteRenderer siteRenderer;
-    /**
-     * Maven Project
-     *
-     * @parameter expression="${project}"
-     * @required @readonly
-     */
-    private MavenProject project;
-
-    @Override
-    protected SiteRenderer getSiteRenderer() {
-        return siteRenderer;
-    }
-
-    @Override
-    protected String getOutputDirectory() {
-        return outputDirectory;
-
-    }
-
-    @Override
-    protected MavenProject getProject() {
-        return project;
-    }
-
-    @Override
-    protected void executeReport(Locale arg0)
-            throws MavenReportException {
-
-        JavaClass[] classes = getJavaClassesFromSources();
-        boolean pathAnnotationExists = false;
-        for (JavaClass clazz : classes) {
-            if (hasPathAnnotation(clazz)) {
-                pathAnnotationExists = true;
-                break;
-            }
-        }
-        Sink sink = getSink();
-        sink.head();
-        sink.title();
-        sink.text("JaxRs Report");
-        sink.title_();
-        sink.head_();
-        sink.body();
-        if(pathAnnotationExists) {
-            
-
-            for (JavaClass clazz : classes) {
-                if (hasPathAnnotation(clazz)) {
-                    sink.section1();
-                    sink.sectionTitle1();
-                    sink.text("Class: " + clazz.getName());
-                    sink.sectionTitle1_();
-                    sink.lineBreak();
-                    sink.text("Package: " + clazz.getPackage().getName());
-                    sink.lineBreak();
-                    sink.lineBreak();
-                    for (Annotation annotation : clazz.getAnnotations()) {
-                        if (annotation.getParameterValue().toString().contains("javax.ws.rs.Path")) {
-                            sink.bold();
-                            sink.text("Root Resource Path: " + annotation.getNamedParameter("value").toString());
-                            sink.bold_();
-                        }
-                    }
-                    sink.lineBreak();
-                    sink.lineBreak();
-                    sink.paragraph();
-                    sink.text(clazz.getComment());
-                    sink.paragraph_();
-                    sink.section1_();
-                    sink.horizontalRule();
-                    for (JavaMethod mth : clazz.getMethods()) {
-                        if (hasPathAnnotation(mth)) {
-                            for (Annotation annotation : mth.getAnnotations()) {
-                                if (annotation.getParameterValue().toString().contains("javax.ws.rs.Path")) {
-                                    sink.section2();
-                                    sink.sectionTitle2();
-                                    sink.text("Path: " + annotation.getNamedParameter("value"));
-                                    sink.sectionTitle2_();
-                                }
-                            }
-                            for (Annotation annotation : mth.getAnnotations()) {
-                                if (annotation.getParameterValue().toString().contains("javax.ws.rs.Produces")) {
-                                    sink.bold();
-                                    sink.text("Produces: " + annotation.getNamedParameter("value"));
-                                    sink.bold_();
-                                    sink.lineBreak();
-                                    sink.lineBreak();
-                                } else if (annotation.getParameterValue().toString()
-                                        .contains("javax.ws.rs") && !annotation.getParameterValue().toString()
-                                        .contains("javax.ws.rs.Path")) {
-                                    sink.bold();
-                                    sink.text("Http Method: " + annotation.getType()
-                                            .toString().substring("javax.ws.rs.".length()));
-                                    sink.bold_();
-                                    sink.lineBreak();
-                                    sink.lineBreak();
-                                }
-                            }
-                            sink.bold();
-                            sink.text("Method: " + mth.getName());
-                            sink.bold_();
-                            sink.lineBreak();
-                            sink.lineBreak();
-                            sink.paragraph();
-                            sink.text(mth.getComment());
-                            sink.paragraph_();
-                            DocletTag[] params = mth.getTagsByName("param");
-                            if (params != null) {
-                                sink.numberedList(params.length);
-                                for (DocletTag param : params) {
-                                    sink.numberedListItem();
-                                    sink.text("param: " + param.getValue());
-                                    sink.numberedListItem_();
-                                }
-                                sink.numberedList_();
-                            }
-                            DocletTag returns = mth.getTagByName("return");
-                            if (returns != null) {
-                                sink.text("Returns " + returns.getValue());
-                            }
-                            sink.lineBreak();
-                            sink.lineBreak();
-                            sink.paragraph();
-                            sink.bold();
-                            sink.text("Method Declaration Signature: ");
-                            sink.bold_();
-                            sink.text(mth.getDeclarationSignature(true));
-                            sink.paragraph_();
-                            sink.section2_();
-                        }
-                    }
-                    sink.section1_();
-                }
-            }
-        } else {
-            sink.section1();
-            sink.bold();
-            sink.text("This project doesn't expose any JaxRs resources");
-            sink.bold_();
-            sink.section1_();
-        }
-        sink.body_();
-        sink.flush();
-        sink.close();
-    }
-
-
-    @Override
-    public String getOutputName() {
-        return "jaxrs-report";
-    }
-
-    @Override
-    public String getName(Locale locale) {
-        return "JaxRs Report";
-    }
-
-    @Override
-    public String getDescription(Locale locale) {
-        return "Description of the REST webservices";
-    }
-
-    public boolean hasPathAnnotation(AbstractBaseJavaEntity entity) {
-
-        for (Annotation annotation : entity.getAnnotations()) {
-            if (annotation.getParameterValue().toString().contains("javax.ws.rs.Path")) {
-                return true;
-            }
-
-        }
-        return false;
-    }
-
-    public JavaSource[] getSources() {
-        String src = baseDir + File.separator + "src";
-        File file = new File(src);
-        JavaDocBuilder builder = new JavaDocBuilder();
-        builder.addSourceTree(file);
-        return builder.getSources();
-
-    }
-
-    private JavaClass[] getJavaClassesFromSources() {
-        final JavaSource[] sources = this.getSources();
-        final List<JavaClass> classes = new ArrayList<JavaClass>();
-        for (int i = 0; i < sources.length; i++) {
-            for (int j = 0; j < sources[i].getClasses().length; j++) {
-                final JavaClass clazz = sources[i].getClasses()[j];
-                classes.add(clazz);
-                for (int k = 0; k < clazz.getNestedClasses().length; k++) {
-                    final JavaClass nestedClass = clazz.getNestedClasses()[k];
-                    classes.add(nestedClass);
-                }
-            }
-        }
-        return classes.toArray(new JavaClass[classes.size()]);
-    }
-}


Mime
View raw message