You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2010/02/26 14:50:25 UTC
svn commit: r916681 - in /tuscany/sandbox/kgoodson/jagg-webapp: ./
src/main/resources/ src/main/webapp/META-INF/ src/main/webapp/WEB-INF/
Author: kelvingoodson
Date: Fri Feb 26 13:50:24 2010
New Revision: 916681
URL: http://svn.apache.org/viewvc?rev=916681&view=rev
Log:
fixing to mirror sample-store-webapp changes
Added:
tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html
- copied unchanged from r915751, tuscany/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html
Removed:
tuscany/sandbox/kgoodson/jagg-webapp/build.xml
tuscany/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html
Modified:
tuscany/sandbox/kgoodson/jagg-webapp/pom.xml
tuscany/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite
tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml
tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml
Modified: tuscany/sandbox/kgoodson/jagg-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/kgoodson/jagg-webapp/pom.xml?rev=916681&r1=916680&r2=916681&view=diff
==============================================================================
--- tuscany/sandbox/kgoodson/jagg-webapp/pom.xml (original)
+++ tuscany/sandbox/kgoodson/jagg-webapp/pom.xml Fri Feb 26 13:50:24 2010
@@ -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>
Modified: tuscany/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite?rev=916681&r1=916680&r2=916681&view=diff
==============================================================================
--- tuscany/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite (original)
+++ tuscany/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite Fri Feb 26 13:50:24 2010
@@ -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>
Modified: tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=916681&r1=916680&r2=916681&view=diff
==============================================================================
--- tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml Fri Feb 26 13:50:24 2010
@@ -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
Modified: tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml?rev=916681&r1=916680&r2=916681&view=diff
==============================================================================
--- tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ tuscany/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml Fri Feb 26 13:50:24 2010
@@ -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>