Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 31287 invoked from network); 2 Mar 2011 14:47:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Mar 2011 14:47:13 -0000 Received: (qmail 85960 invoked by uid 500); 2 Mar 2011 14:47:13 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 85822 invoked by uid 500); 2 Mar 2011 14:47:11 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 85815 invoked by uid 99); 2 Mar 2011 14:47:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2011 14:47:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2011 14:47:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7475623889DA; Wed, 2 Mar 2011 14:46:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076233 - in /geronimo/server/trunk/testsuite/aries-testsuite: ./ require-bundle-test/ require-bundle-test/CalculatorBeanBundle_B/ require-bundle-test/CalculatorBeanBundle_B/src/ require-bundle-test/CalculatorBeanBundle_B/src/main/ require... Date: Wed, 02 Mar 2011 14:46:32 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110302144632.7475623889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xiaming Date: Wed Mar 2 14:46:30 2011 New Revision: 1076233 URL: http://svn.apache.org/viewvc?rev=1076233&view=rev Log: GERONIMO-5846 require-bundle usage scenario 1: bundle-version and visibility are specified Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/pom.xml (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/bean/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/bean/CalculatorBean.java (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/pom.xml (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/reexport/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/reexport/ExportBean.java (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/pom.xml (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/servlet/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/servlet/CalculatorServlet.java (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/WEB-INF/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/WEB-INF/web.xml (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/index.html (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/pom.xml (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/tests/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/tests/RequireBundleCalculatorServletTest.java (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/resources/ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/resources/testng.xml (with props) geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/pom.xml (with props) Modified: geronimo/server/trunk/testsuite/aries-testsuite/pom.xml Modified: geronimo/server/trunk/testsuite/aries-testsuite/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/pom.xml?rev=1076233&r1=1076232&r2=1076233&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/pom.xml (original) +++ geronimo/server/trunk/testsuite/aries-testsuite/pom.xml Wed Mar 2 14:46:30 2011 @@ -41,6 +41,7 @@ simple jpa + require-bundle-test Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/pom.xml?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/pom.xml (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/pom.xml Wed Mar 2 14:46:30 2011 @@ -0,0 +1,56 @@ + + + + + 4.0.0 + + org.apache.geronimo.testsuite + require-bundle-test + 3.0-SNAPSHOT + + + CalculatorBeanBundle_B + Geronimo TestSuite :: Aries Testsuite :: Require-Bundle CalculatorBeanBundle_B + bundle + + + ${project.name} + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.apache.geronimo.samples.requirebundle.CalculatorBeanBundle_C;bundle-version=${bundleVersion};visibility:=reexport + + org.apache.geronimo.samples.requirebundle.CalculatorBeanBundle_B + + + + + + + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/bean/CalculatorBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/bean/CalculatorBean.java?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/bean/CalculatorBean.java (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/bean/CalculatorBean.java Wed Mar 2 14:46:30 2011 @@ -0,0 +1,33 @@ +/* + 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.geronimo.samples.requirebundle.bean; + +public class CalculatorBean { + + public double add(double d1, double d2) { + double tmp = d1 + d2; + return tmp; + } + + public double sub(double d1, double d2) { + double tmp = d1 - d2; + return tmp; + } + +} Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/bean/CalculatorBean.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/bean/CalculatorBean.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_B/src/main/java/org/apache/geronimo/samples/requirebundle/bean/CalculatorBean.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/pom.xml?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/pom.xml (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/pom.xml Wed Mar 2 14:46:30 2011 @@ -0,0 +1,57 @@ + + + + + 4.0.0 + + org.apache.geronimo.testsuite + require-bundle-test + 3.0-SNAPSHOT + + + CalculatorBeanBundle_C + Geronimo TestSuite :: Aries Testsuite :: Require-Bundle CalculatorBeanBundle_C + bundle + + + ${project.name} + + + + + + org.apache.felix + maven-bundle-plugin + true + + + *;version=${packageVersion} + org.apache.geronimo.samples.requirebundle.CalculatorBeanBundle_C + + + + + + + + + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/reexport/ExportBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/reexport/ExportBean.java?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/reexport/ExportBean.java (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/reexport/ExportBean.java Wed Mar 2 14:46:30 2011 @@ -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 org.apache.geronimo.samples.requirebundle.bean.reexport; + +public class ExportBean { + + public String hello_reexport() { + return "
  • Bean_C [\"ExportBean\"] says: Hello! Reexport in Require-bundle attribute is effective since this INFO displays.
    • "; + } + +} Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/reexport/ExportBean.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/reexport/ExportBean.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorBeanBundle_C/src/main/java/org/apache/geronimo/samples/requirebundle/bean/reexport/ExportBean.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/pom.xml?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/pom.xml (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/pom.xml Wed Mar 2 14:46:30 2011 @@ -0,0 +1,75 @@ + + + + + 4.0.0 + + org.apache.geronimo.testsuite + require-bundle-test + 3.0-SNAPSHOT + + + CalculatorServletBundle_A + Geronimo TestSuite :: Aries Testsuite :: Require-Bundle CalculatorServletBundle_A + bundle + + + ${project.name} + + + + + org.apache.geronimo.specs + geronimo-servlet_3.0_spec + provided + + + org.apache.geronimo.testsuite + CalculatorBeanBundle_B + ${project.version} + provided + + + org.apache.geronimo.testsuite + CalculatorBeanBundle_C + ${project.version} + provided + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + /calculator1 + org.apache.geronimo.samples.requirebundle.CalculatorBeanBundle_B;bundle-version=${bundleVersion} + org.apache.geronimo.samples.requirebundle.CalculatorServletBundle_A + + + + + + + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/servlet/CalculatorServlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/servlet/CalculatorServlet.java?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/servlet/CalculatorServlet.java (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/servlet/CalculatorServlet.java Wed Mar 2 14:46:30 2011 @@ -0,0 +1,72 @@ +/* + 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.geronimo.samples.requirebundle.servlet; + +import java.io.IOException; +import java.io.PrintWriter; +import java.text.DecimalFormat; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.geronimo.samples.requirebundle.bean.CalculatorBean; +import org.apache.geronimo.samples.requirebundle.bean.reexport.ExportBean; + + +public class CalculatorServlet extends HttpServlet { + protected void processRequest(HttpServletRequest req, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); + PrintWriter out = response.getWriter(); + try { + out.println(""); + DecimalFormat mydf = new DecimalFormat("####.#"); + CalculatorBean cb = new CalculatorBean(); + ExportBean eb = new ExportBean(); + String re = eb.hello_reexport(); + out.println("

    This sample presents features:require-bundle

    "); + out.println("

    "+re+"

    "); + out.println("
  • Bean_B [\"CalculatorBean\"] says, result of ADD operation [\"10.0 + 8.0 = ?\"] is: " + mydf.format(cb.add(10.0, 8.0))+"
    • "); + out.println("
  • Bean_B [\"CalculatorBean\"] says, result of SUB operation [\"10.0 - 8.0 = ?\"] is: " + mydf.format(cb.sub(10.0, 8.0))+"
    • "); + out.println(""); + } catch ( Exception e ) { + e.printStackTrace(); + throw new ServletException(e); + } finally { + out.close(); + } + } + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + processRequest(request, response); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + processRequest(request, response); + } + + @Override + public String getServletInfo() { + return "CalculatorServlet in require-bundle-test"; + } + +} + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/servlet/CalculatorServlet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/servlet/CalculatorServlet.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/java/org/apache/geronimo/samples/requirebundle/servlet/CalculatorServlet.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/WEB-INF/web.xml?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/WEB-INF/web.xml (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/WEB-INF/web.xml Wed Mar 2 14:46:30 2011 @@ -0,0 +1,44 @@ + + + + + HelloWorldWAB1 + + index.html + index.htm + index.jsp + default.html + default.htm + default.jsp + + + CalculatorServlet + CalculatorServlet + org.apache.geronimo.samples.requirebundle.servlet.CalculatorServlet + + + CalculatorServlet + /CalculatorServlet + + + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/index.html URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/index.html?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/index.html (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/index.html Wed Mar 2 14:46:30 2011 @@ -0,0 +1,19 @@ + + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/index.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/index.html ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/CalculatorServletBundle_A/src/main/resources/index.html ------------------------------------------------------------------------------ svn:mime-type = text/html Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/pom.xml?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/pom.xml (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/pom.xml Wed Mar 2 14:46:30 2011 @@ -0,0 +1,136 @@ + + + + + + 4.0.0 + + + org.apache.geronimo.testsuite + require-bundle-test + 3.0-SNAPSHOT + + + RequireBundle-eba + Geronimo TestSuite :: Aries Testsuite :: Require-Bundle EBA + eba + + + + org.apache.geronimo.testsuite + CalculatorBeanBundle_C + ${project.version} + + + org.apache.geronimo.testsuite + CalculatorBeanBundle_B + ${project.version} + + + org.apache.geronimo.testsuite + CalculatorServletBundle_A + ${project.version} + + + + + + ${project.basedir}/src/main/resources + true + + + + + org.apache.aries + eba-maven-plugin + true + + + + + 1.0.0 + + + true + + + + + + + + + it + + + it + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + calculator1 + + + + + + org.apache.geronimo.buildsupport + geronimo-maven-plugin + + + deploy-eba + pre-integration-test + + deploy-module + + + ${project.build.directory}/${project.artifactId}-${project.version}.eba + + + + + undeploy-eba + post-integration-test + + undeploy-module + + + application/${project.groupId}.${project.artifactId}/1.0.0/eba + + + + + + + + + + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/tests/RequireBundleCalculatorServletTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/tests/RequireBundleCalculatorServletTest.java?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/tests/RequireBundleCalculatorServletTest.java (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/tests/RequireBundleCalculatorServletTest.java Wed Mar 2 14:46:30 2011 @@ -0,0 +1,64 @@ +/* + 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.geronimo.testsuite.requirebundle.tests; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpException; +import org.apache.commons.httpclient.HttpMethodBase; +import org.apache.commons.httpclient.methods.PostMethod; + +import org.testng.Assert; +import org.testng.annotations.Test; + + +public class RequireBundleCalculatorServletTest{ + + + /** + * Test 1 + * Test + * Require-Bundle in OSGi core spec. + * @throws Exception + */ + @Test + public void RequireBundleTest()throws Exception + { + String contextroot = System.getProperty("webAppName"); + String root = "http://localhost:8080/"+contextroot; + int status = 0; + HttpClient nclient = new HttpClient(); + String url = root+"/CalculatorServlet"; + HttpMethodBase httpMethod; + httpMethod = new PostMethod(url); + status = nclient.executeMethod(httpMethod); + Assert.assertEquals(status, 200); + String response = null; + if(status==200) + { + response = new String(httpMethod.getResponseBodyAsString().getBytes("8859_1")); + } + Assert.assertTrue(response.contains("Hello! Reexport in Require-bundle attribute is effective since this INFO displays.")); + Assert.assertTrue(response.contains("result of ADD operation [\"10.0 + 8.0 = ?\"] is: 18")); + Assert.assertTrue(response.contains("result of SUB operation [\"10.0 - 8.0 = ?\"] is: 2")); + httpMethod.releaseConnection(); + } + +} + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/tests/RequireBundleCalculatorServletTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/tests/RequireBundleCalculatorServletTest.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/java/org/apache/geronimo/testsuite/requirebundle/tests/RequireBundleCalculatorServletTest.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/resources/testng.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/resources/testng.xml?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/resources/testng.xml (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/resources/testng.xml Wed Mar 2 14:46:30 2011 @@ -0,0 +1,29 @@ + + + + + + + + + + + + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/resources/testng.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/resources/testng.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/RequireBundle-eba/src/test/resources/testng.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/pom.xml?rev=1076233&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/pom.xml (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/pom.xml Wed Mar 2 14:46:30 2011 @@ -0,0 +1,48 @@ + + + + + + 4.0.0 + + + org.apache.geronimo.testsuite + aries-testsuite + 3.0-SNAPSHOT + + + require-bundle-test + Geronimo TestSuite :: Aries Testsuite :: Require-Bundle Test + pom + + + + 1.0 + 1.0.0 + + + + CalculatorBeanBundle_C + CalculatorBeanBundle_B + CalculatorServletBundle_A + RequireBundle-eba + + + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/require-bundle-test/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml