You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2008/11/05 17:30:51 UTC
svn commit: r711604 - in /geronimo/plugins/tuscany/trunk: ./
samples/helloworld-jsp/ samples/helloworld-jsp/src/
samples/helloworld-jsp/src/main/ samples/helloworld-jsp/src/main/java/
samples/helloworld-jsp/src/main/java/sample/ samples/helloworld-jsp/...
Author: vamsic007
Date: Wed Nov 5 08:30:50 2008
New Revision: 711604
URL: http://svn.apache.org/viewvc?rev=711604&view=rev
Log:
GERONIMO-4343 Tuscany Geronimo plugin bring up
o Helloworld JSP sample application.
Added:
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/pom.xml (with props)
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/sample/
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/sample/Helloworld.java (with props)
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml (with props)
geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/hello.jsp (with props)
Modified:
geronimo/plugins/tuscany/trunk/pom.xml
Modified: geronimo/plugins/tuscany/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/pom.xml?rev=711604&r1=711603&r2=711604&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/pom.xml Wed Nov 5 08:30:50 2008
@@ -337,6 +337,11 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-api</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-sca</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
@@ -741,6 +746,36 @@
<tagBase>https://svn.apache.org/repos/asf/geronimo/plugins/tuscany/tags</tagBase>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
+ <archive>
+ <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+
+ <!--
+ HACK: Include legal files explicity, otherwise they will end up in the wrong path
+ or in another jar file in the war.
+
+ NOTE: targetPath is broken for webResources (as documented)
+ -->
+ <webResources>
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/LICENSE*</include>
+ <include>META-INF/NOTICE*</include>
+ <include>META-INF/DISCLAIMER*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
</build>
Added: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/pom.xml?rev=711604&view=auto
==============================================================================
--- geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/pom.xml (added)
+++ geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/pom.xml Wed Nov 5 08:30:50 2008
@@ -0,0 +1,73 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>tuscany-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>helloworld-jsp</artifactId>
+ <name>Geronimo Plugins :: Helloworld JSP</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-tuscany</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-tuscany-implementation-web</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ </plugins>
+ <finalName>${artifactId}</finalName>
+ </build>
+</project>
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/sample/Helloworld.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/sample/Helloworld.java?rev=711604&view=auto
==============================================================================
--- geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/sample/Helloworld.java (added)
+++ geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/sample/Helloworld.java Wed Nov 5 08:30:50 2008
@@ -0,0 +1,27 @@
+/*
+ * 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 sample;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Helloworld {
+
+ String sayHello(String name);
+}
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/sample/Helloworld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/sample/Helloworld.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/java/sample/Helloworld.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/geronimo-web.xml?rev=711604&view=auto
==============================================================================
--- geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/geronimo-web.xml Wed Nov 5 08:30:50 2008
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+ <environment>
+ <moduleId>
+ <groupId>test</groupId>
+ <artifactId>helloworld-sample</artifactId>
+ <version>2.0</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId> org.apache.geronimo.plugins</groupId>
+ <artifactId>tuscany-tomcat</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </environment>
+</web-app>
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml?rev=711604&view=auto
==============================================================================
--- geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml Wed Nov 5 08:30:50 2008
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * 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.
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+ <display-name>Helloworld JSP Sample</display-name>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>hello.jsp</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/hello.jsp
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/hello.jsp?rev=711604&view=auto
==============================================================================
--- geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/hello.jsp (added)
+++ geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/hello.jsp Wed Nov 5 08:30:50 2008
@@ -0,0 +1,36 @@
+<!--
+ * 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.
+-->
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>
+
+<sca:reference name="service" type="sample.Helloworld" />
+
+<html>
+ <body >
+
+ <h2>Helloworld JSP Sample</h2>
+
+ Calling service.sayHello("world") returns:
+
+ <p>
+
+ <%= service.sayHello("world") %>
+
+ </body>
+</html>
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/hello.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/hello.jsp
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/tuscany/trunk/samples/helloworld-jsp/src/main/webapp/hello.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain