You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/11/10 18:46:50 UTC

svn commit: r834562 - in /tuscany/sandbox/rfeng/tuscany-provisioning: ./ META-INF/ src/main/java/org/apache/tuscany/sca/provision/ src/main/java/org/apache/tuscany/sca/provision/servlet/ src/main/webapp/ src/main/webapp/WEB-INF/ src/main/webapp/WEB-INF...

Author: rfeng
Date: Tue Nov 10 17:46:50 2009
New Revision: 834562

URL: http://svn.apache.org/viewvc?rev=834562&view=rev
Log:
Turn the module into a webapp

Added:
    tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/servlet/
    tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/servlet/ExtensionListerServlet.java   (with props)
    tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/
    tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/WEB-INF/
    tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/WEB-INF/lib/
    tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/WEB-INF/web.xml   (with props)
    tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/index.html   (with props)
Modified:
    tuscany/sandbox/rfeng/tuscany-provisioning/META-INF/MANIFEST.MF
    tuscany/sandbox/rfeng/tuscany-provisioning/pom.xml
    tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/ExtensionIntrospector.java

Modified: tuscany/sandbox/rfeng/tuscany-provisioning/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/tuscany-provisioning/META-INF/MANIFEST.MF?rev=834562&r1=834561&r2=834562&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/tuscany-provisioning/META-INF/MANIFEST.MF (original)
+++ tuscany/sandbox/rfeng/tuscany-provisioning/META-INF/MANIFEST.MF Tue Nov 10 17:46:50 2009
@@ -9,7 +9,9 @@
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Node Implementation
-Import-Package: org.apache.tuscany.sca.core;version="2.0.0",
+Import-Package: javax.servlet;version="2.5.0",
+ javax.servlet.http;version="2.5.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.extensibility;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.provision
 Bundle-DocURL: http://www.apache.org/

Modified: tuscany/sandbox/rfeng/tuscany-provisioning/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/tuscany-provisioning/pom.xml?rev=834562&r1=834561&r2=834562&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/tuscany-provisioning/pom.xml (original)
+++ tuscany/sandbox/rfeng/tuscany-provisioning/pom.xml Tue Nov 10 17:46:50 2009
@@ -29,29 +29,9 @@
 
     <artifactId>tuscany-provision</artifactId>
     <name>Apache Tuscany SCA Provisioning</name>
-
+    <packaging>war</packaging>
+    
     <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-runtime</artifactId>
@@ -68,6 +48,27 @@
             <version>2.0.8</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-extensibility</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-all</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
 </project>

Modified: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/ExtensionIntrospector.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/ExtensionIntrospector.java?rev=834562&r1=834561&r2=834562&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/ExtensionIntrospector.java (original)
+++ tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/ExtensionIntrospector.java Tue Nov 10 17:46:50 2009
@@ -20,6 +20,9 @@
 package org.apache.tuscany.sca.provision;
 
 import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -54,6 +57,8 @@
  */
 public class ExtensionIntrospector {
     private ExtensionPointRegistry registry;
+    private ClassLoader classLoader;
+
     private boolean loaded;
     private boolean offline;
     private MavenRuntime mavenRuntime = new DefaultMavenRuntime();
@@ -77,8 +82,35 @@
      * @param registry
      */
     public ExtensionIntrospector(ExtensionPointRegistry registry) {
-        super();
+        this(registry, null);
+    }
+
+    public ExtensionIntrospector(ExtensionPointRegistry registry, ClassLoader classLoader) {
         this.registry = (registry == null) ? new DefaultExtensionPointRegistry() : registry;
+        this.classLoader = (classLoader == null) ? ExtensionIntrospector.class.getClassLoader() : classLoader;
+    }
+
+    public ExtensionIntrospector() {
+        this(null, null);
+    }
+
+    public ExtensionIntrospector(URL distribution) {
+        this(null, createClassLoader(distribution));
+    }
+
+    private static ClassLoader createClassLoader(URL distribution) {
+        String url = distribution.toString();
+        if (!url.endsWith("/")) {
+            url = url + "/";
+        }
+        url = url + "features/tuscany-sca-manifest.jar";
+        URL path = null;
+        try {
+            path = new URL(url);
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException(e);
+        }
+        return new URLClassLoader(new URL[] {path}, ExtensionIntrospector.class.getClassLoader());
     }
 
     public MavenProject findModule(String extensionType) {
@@ -318,7 +350,7 @@
     }
 
     public static String generateDojoData(String[] args) throws Exception {
-        ExtensionIntrospector introspector = new ExtensionIntrospector(null);
+        ExtensionIntrospector introspector = new ExtensionIntrospector();
         introspector.setOffline("true".equalsIgnoreCase(System.getProperty("offline")));
         introspector.start();
         Map<String, Collection<Artifact>> map = introspector.getDependencies(args);

Added: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/servlet/ExtensionListerServlet.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/servlet/ExtensionListerServlet.java?rev=834562&view=auto
==============================================================================
--- tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/servlet/ExtensionListerServlet.java (added)
+++ tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/servlet/ExtensionListerServlet.java Tue Nov 10 17:46:50 2009
@@ -0,0 +1,68 @@
+/*
+ * 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.tuscany.sca.provision.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tuscany.sca.provision.ExtensionIntrospector;
+
+/**
+ * Servlet implementation class ExtensionListerServlet
+ */
+public class ExtensionListerServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+    private String json;
+
+    /**
+     * Default constructor. 
+     */
+    public ExtensionListerServlet() {
+    }
+
+    /**
+     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        synchronized (this) {
+            if (json == null) {
+                try {
+                    json = ExtensionIntrospector.generateDojoData(new String[0]);
+                } catch (Exception e) {
+                    throw new ServletException(e);
+                }
+            }
+        }
+        response.setContentType("application/json");
+        response.getWriter().write(json);
+    }
+
+    /**
+     * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+        IOException {
+    }
+
+}

Propchange: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/servlet/ExtensionListerServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/java/org/apache/tuscany/sca/provision/servlet/ExtensionListerServlet.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/WEB-INF/web.xml?rev=834562&view=auto
==============================================================================
--- tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/WEB-INF/web.xml (added)
+++ tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/WEB-INF/web.xml Tue Nov 10 17:46:50 2009
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+  <display-name>tuscany-provisioning-webapp</display-name>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+    <welcome-file>default.html</welcome-file>
+    <welcome-file>default.htm</welcome-file>
+    <welcome-file>default.jsp</welcome-file>
+  </welcome-file-list>
+  <servlet>
+    <description></description>
+    <display-name>ExtensionListerServlet</display-name>
+    <servlet-name>ExtensionListerServlet</servlet-name>
+    <servlet-class>org.apache.tuscany.sca.provision.servlet.ExtensionListerServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ExtensionListerServlet</servlet-name>
+    <url-pattern>/extensions</url-pattern>
+  </servlet-mapping>
+</web-app>
\ No newline at end of file

Propchange: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/index.html?rev=834562&view=auto
==============================================================================
--- tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/index.html (added)
+++ tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/index.html Tue Nov 10 17:46:50 2009
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Tuscany Extensions</title>
+
+
+<link rel="stylesheet" type="text/css"
+	href="http://ajax.googleapis.com/ajax/libs/dojo/1.3.2/dijit/themes/tundra/tundra.css">
+<style type="text/css">
+body,html {
+	font-family: helvetica, arial, sans-serif;
+	font-size: 90%;
+}
+</style>
+</head>
+
+<body class="tundra">
+
+<h1>Tuscany Extensions</h1>
+
+<div dojoType="dojo.data.ItemFileReadStore" jsId="extensionStore"
+	url="extensions">
+</div>
+<div dojoType="dijit.tree.ForestStoreModel" jsId="extensionModel"
+	store="extensionStore" childrenAttrs="types, artifacts"
+	rootId="extensionRoot" rootLabel="Extensions">
+</div>
+<div dojoType="dijit.Tree" id="extensionTree" model="extensionModel"
+	showRoot="true">
+</div>
+</body>
+
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/dojo/1.3.2/dojo/dojo.xd.js"
+	djConfig="parseOnLoad: true"></script>
+<script type="text/javascript">
+        dojo.require("dojo.data.ItemFileReadStore");
+        dojo.require("dijit.tree.ForestStoreModel");
+        dojo.require("dijit.Tree");
+</script>
+</html>
\ No newline at end of file

Propchange: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/rfeng/tuscany-provisioning/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Rev Date