diff options
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/kgoodson/jagg-webapp/build.xml | 79 | ||||
| -rw-r--r-- | sandbox/kgoodson/jagg-webapp/pom.xml | 180 | ||||
| -rw-r--r-- | sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite | 9 | ||||
| -rw-r--r-- | sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml | 6 | ||||
| -rw-r--r-- | sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html (renamed from sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html) | 0 | ||||
| -rw-r--r-- | sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml | 2 |
6 files changed, 33 insertions, 243 deletions
diff --git a/sandbox/kgoodson/jagg-webapp/build.xml b/sandbox/kgoodson/jagg-webapp/build.xml deleted file mode 100644 index e186df80e8..0000000000 --- a/sandbox/kgoodson/jagg-webapp/build.xml +++ /dev/null @@ -1,79 +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. ---> -<project name="jagg" default="compile"> - <property name="test.class" value="launch.Launch" /> - <property name="test.jar" value="sample-jagg.jar" /> - - <target name="init"> - <mkdir dir="target/classes"/> - </target> - - <target name="compile" depends="init"> - <javac srcdir="src/main/java" - destdir="target/classes" - debug="on" - source="1.5" - target="1.5"> - <classpath> - <pathelement location="../../lib/tuscany-sca-manifest.jar"/> - <fileset refid="3rdparty.jars"/> - </classpath> - </javac> - <copy todir="target/classes"> - <fileset dir="src/main/resources"/> - </copy> - <jar destfile="target/${test.jar}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${test.class}" /> - </manifest> - </jar> - </target> - - <target name="run-classes"> - <java classname="${test.class}" - fork="true"> - <classpath> - <pathelement path="target/classes"/> - <pathelement location="../../lib/tuscany-sca-manifest.jar"/> - <fileset refid="3rdparty.jars"/> - </classpath> - </java> - </target> - - <target name="run"> - <java classname="${test.class}" - fork="true"> - <classpath> - <pathelement path="target/${test.jar}"/> - <pathelement location="../../lib/tuscany-sca-manifest.jar"/> - <fileset refid="3rdparty.jars"/> - </classpath> - </java> - </target> - - <target name="clean"> - <delete quiet="true" includeemptydirs="true"> - <fileset dir="target"/> - </delete> - </target> - - <fileset id="3rdparty.jars" dir="../../lib"> - <include name="saxon-8.7.jar"/> - </fileset> -</project> diff --git a/sandbox/kgoodson/jagg-webapp/pom.xml b/sandbox/kgoodson/jagg-webapp/pom.xml index 69e7fca7cd..ecf8d2fab2 100644 --- a/sandbox/kgoodson/jagg-webapp/pom.xml +++ b/sandbox/kgoodson/jagg-webapp/pom.xml @@ -29,115 +29,19 @@ <name>Apache Tuscany SCA Sample JIRA Aggregator</name> <packaging>war</packaging> - <repositories> - <repository> - <id>apache.incubator</id> - <url>http://people.apache.org/repo/m2-incubating-repository</url> - </repository> - </repositories> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxb2-maven-plugin</artifactId> - <version>1.3</version> - </plugin> - </plugins> - </pluginManagement> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgument>-Djava.endorsed.dirs=target/endorsed</compilerArgument> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxb-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <version>0.7.1</version> - <executions> - <execution> - <id>generate-jaxb</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <generatePackage>com.example.ipo.jaxb</generatePackage> - <generateDirectory>${project.build.directory}/jaxb-source</generateDirectory> - <schemaDirectory>${basedir}/src/main/resources</schemaDirectory> - <schemaIncludes> - <!-- <include>ipo.xsd</include>--> - <include>JiraSideband.xsd</include> - <include>JiraRSS.xsd</include> - </schemaIncludes> - </configuration> - </plugin> - - </plugins> - <finalName>${artifactId}</finalName> - </build> <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>jagg-logic</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-webapp</artifactId> <version>2.0-SNAPSHOT</version> </dependency> @@ -190,23 +94,9 @@ </dependency> <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-http-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.5</version> + <version>4.8.1</version> <scope>test</scope> </dependency> <dependency> @@ -214,52 +104,30 @@ <artifactId>rome</artifactId> <version>1.0</version> </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.0.3</version> - </dependency> - <dependency> - <groupId>org.jvnet.jaxb2_commons</groupId> - <artifactId>runtime</artifactId> - <version>0.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-http-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <version>2.6</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jvnet.jaxb2_commons</groupId> - <artifactId>testing</artifactId> - <version>0.4.1</version> - <scope>test</scope> - </dependency> </dependencies> + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>tomcat-maven-plugin</artifactId> + <version>1.0-beta-1</version> + <configuration> + <!-- Key used for configuring access to server in settings.xml--> + + <server>tomcat</server> + <!-- context for the webapp, as finalName is not being honored --> + <path>/${artifactId}</path> + </configuration> + </plugin> + </plugins> + </build> diff --git a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite b/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite index c6f837c0d2..dbff8c905f 100644 --- a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite +++ b/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite @@ -24,16 +24,17 @@ <component name="planApp"> <tuscany:implementation.widget location="plan.html"/> - <reference name="plan" target="Plan"> - <tuscany:binding.jsonrpc uri="http://localhost:8080/sample-jagg-webapp/Plan"/> - </reference> + <service name="Widget"> + <tuscany:binding.http uri="/plan"/> + </service> + <reference name="plan" target="Plan"></reference> </component> <component name="Plan"> <implementation.java class="services.PlanViewImpl"/> <property name="planFile">src/main/resources/jiraSideBand.xml</property> <service name="PlanView"> - <tuscany:binding.jsonrpc uri="http://localhost:8080/sample-jagg-webapp/Plan"/> + <tuscany:binding.jsonrpc uri="/Plan"/> </service> </component> diff --git a/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml index 9d874181fe..8122539244 100644 --- a/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml +++ b/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:store="http://plan"> - <deployable composite="plan:plan"/> +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" + xmlns:jagg="http://jagg"> + <deployable composite="jagg:jagg"/> </contribution>
\ No newline at end of file diff --git a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html index f064b47160..f064b47160 100644 --- a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html +++ b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html diff --git a/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml index 9c8eb81ae4..ecf656d929 100644 --- a/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml +++ b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml @@ -18,7 +18,7 @@ * under the License. --> <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>sample-jagg-secure-webapp</display-name> + <display-name>sample-jagg-webapp</display-name> <filter> <filter-name>tuscany</filter-name> |