You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2011/01/14 23:17:37 UTC
svn commit: r1059187 - in /aries/sandbox/jbohn/interceptor-proto:
application/
application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/
application/application-obr-resolver/src/main/resources/org/apache/aries/applic...
Author: jbohn
Date: Fri Jan 14 22:17:36 2011
New Revision: 1059187
URL: http://svn.apache.org/viewvc?rev=1059187&view=rev
Log:
merge -r 1057701:1059162 from trunk
Added:
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/
- copied from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/
- copied from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/db2/
- copied from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/db2/
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/db2/Table.ddl
- copied unchanged from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/db2/Table.ddl
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/derby/
- copied from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/derby/
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/derby/Table.ddl
- copied unchanged from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/derby/Table.ddl
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/oracle/
- copied from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/oracle/
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/oracle/Table.ddl
- copied unchanged from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/oracle/Table.ddl
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/other/
- copied from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/other/
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/other/Table.ddl
- copied unchanged from r1059162, aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/resources/dbscripts/other/Table.ddl
Removed:
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/webapp/dbscripts/
Modified:
aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/resources/org/apache/aries/application/resolver/messages/ResolverMessages.properties
aries/sandbox/jbohn/interceptor-proto/application/pom.xml
aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/pom.xml
aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html
aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml
aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-web/pom.xml
aries/sandbox/jbohn/interceptor-proto/samples/pom.xml
Modified: aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java Fri Jan 14 22:17:36 2011
@@ -192,7 +192,7 @@ public class OBRAriesResolver implements
List<String> unsatisfiedRequirements = new LinkedList<String>();
for (Map.Entry<String, Set<String>> filterEntry : refinedReqs.entrySet()) {
- log.debug("unable to satisfied the filter , filter = " + filterEntry.getKey() + "required by "+filterEntry.getValue());
+ log.debug("unable to satisfy the filter , filter = " + filterEntry.getKey() + "required by "+filterEntry.getValue());
String reason = extractConsumableMessageInfo(filterEntry.getKey(),filterEntry.getValue());
Modified: aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/resources/org/apache/aries/application/resolver/messages/ResolverMessages.properties
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/resources/org/apache/aries/application/resolver/messages/ResolverMessages.properties?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/resources/org/apache/aries/application/resolver/messages/ResolverMessages.properties (original)
+++ aries/sandbox/jbohn/interceptor-proto/application/application-obr-resolver/src/main/resources/org/apache/aries/application/resolver/messages/ResolverMessages.properties Fri Jan 14 22:17:36 2011
@@ -103,21 +103,21 @@ RESOLVER_UNABLE_TO_RESOLVE_SERVICE_WITH_
RESOLVER_UNABLE_TO_RESOLVE_SERVICE_WITH_ATTRS_WITH_VERSION_LOWEX_UP=The service dependency with attributes {0} and the version greater than {1} and less than or equal to {2} cannot be resolved.
RESOLVER_UNABLE_TO_RESOLVE_SERVICE_WITH_ATTRS_WITH_VERSION_LOWEX_UPEX=The service dependency with attributes {0} and the version greater than {1} and less than {2} cannot be resolved.
RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE=The service dependency required by bundle {0} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS=The service dependency with attributes {0} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION=The service dependency with the version {0} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOW=The service dependency with the version greater than or equal to {0} required by bundle {2} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOW_UP=The service dependency with the version greater than or equal to {0} and less than or equal to {2} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOW_UPEX=The service dependency with the version greater than or equal to {0} and less than {2} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOWEX=The service dependency with the version greater than {0} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOWEX_UP=The service dependency with the version greater than {0} and less than or equal to {2} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOWEX_UPEX=The service dependency with the version greater than {0} and less than {2} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION=The service dependency with attributes {0} and the version {2} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOW=The service dependency with attributes {0} and the version greater than or equal to {2} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOW_UP=The service dependency with attributes {0} and the version greater than or equal to {2} and less than or equal to {3} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOW_UPEX=The service dependency with attributes {0} and the version greater than or equal to {2} and less than {3} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOWEX=The service dependency with attributes {0} and the version greater than {2} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOWEX_UP=The service dependency with attributes {0} and the version greater than {2} and less than or equal to {3} required by bundle {1} cannot be resolved.
-RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOWEX_UPEX=The service dependency with attributes {0} and the version greater than {2} and less than {3} required by bundle {1} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS=The service dependency with attributes {1} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION=The service dependency with the version {1} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOW=The service dependency with the version greater than or equal to {1} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOW_UP=The service dependency with the version greater than or equal to {2} and less than or equal to {1} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOW_UPEX=The service dependency with the version greater than or equal to {2} and less than {1} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOWEX=The service dependency with the version greater than {1} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOWEX_UP=The service dependency with the version greater than {2} and less than or equal to {1} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_VERSION_LOWEX_UPEX=The service dependency with the version greater than {2} and less than {1} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION=The service dependency with attributes {1} and the version {2} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOW=The service dependency with attributes {1} and the version greater than or equal to {2} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOW_UP=The service dependency with attributes {1} and the version greater than or equal to {3} and less than or equal to {2} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOW_UPEX=The service dependency with attributes {1} and the version greater than or equal to {3} and less than {2} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOWEX=The service dependency with attributes {1} and the version greater than {2} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOWEX_UP=The service dependency with attributes {1} and the version greater than {3} and less than or equal to {2} required by bundle {0} cannot be resolved.
+RESOLVER_UNABLE_TO_RESOLVE_SERVICE_REQUIRED_BY_BUNDLE_WITH_ATTRS_WITH_VERSION_LOWEX_UPEX=The service dependency with attributes {1} and the version greater than {3} and less than {2} required by bundle {0} cannot be resolved.
RESOLVER_UNABLE_TO_RESOLVE_FILTER=A dependency of unspecified type with filter {0} cannot be resolved.
RESOLVER_UNABLE_TO_RESOLVE_FILTER_REQUIRED_BY_BUNDLE=A dependency of unspecified type with filter {0} required by bundle {1} cannot be resolved.
#
Modified: aries/sandbox/jbohn/interceptor-proto/application/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/application/pom.xml?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/application/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/application/pom.xml Fri Jan 14 22:17:36 2011
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
- <version>2.0.8</version>
+ <version>3.1.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java Fri Jan 14 22:17:36 2011
@@ -222,7 +222,7 @@ public final class ContextHelper {
try {
provider = new ContextProvider(context, ref, factory.getInitialContext(environment));
} finally {
- context.ungetService(ref); // we didn't get something back, so this was no good.
+ if (provider == null) context.ungetService(ref); // we didn't get something back, so this was no good.
}
break;
} else {
Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml Fri Jan 14 22:17:36 2011
@@ -58,17 +58,14 @@
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-extender-war</artifactId>
- <version>0.7.2</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
- <version>0.7.2</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jsp</artifactId>
- <version>0.7.2</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -91,6 +88,10 @@
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini Fri Jan 14 22:17:36 2011
@@ -31,10 +31,11 @@ geronimo-j2ee-connector_1.5_spec-2.0.0.j
geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\
geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\
geronimo-transaction-${geronimoTransactionVersion}.jar@start,\
-pax-web-jetty-bundle-0.7.2.jar@start,\
-pax-web-extender-war-0.7.2.jar@start,\
-pax-web-jsp-0.7.2.jar@start,\
-org.apache.felix.fileinstall-2.0.8.jar@start,\
+geronimo-servlet_2.5_spec-${geronimoServletVersion}.jar@start,\
+pax-web-jetty-bundle-0.8.1.jar@start,\
+pax-web-extender-war-0.8.1.jar@start,\
+pax-web-jsp-0.8.1.jar@start,\
+org.apache.felix.fileinstall-3.1.4.jar@start,\
org.apache.felix.bundlerepository-1.6.4.jar@start,\
org.apache.aries.application.install-${ariesApplicationVersion}.jar@start,\
org.apache.aries.application.management-${ariesApplicationVersion}.jar@start,\
Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/pom.xml?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/pom.xml Fri Jan 14 22:17:36 2011
@@ -70,7 +70,6 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
- <Bundle-ClassPath>.</Bundle-ClassPath>
<Web-ContextPath>/ariestrader</Web-ContextPath>
<Web-JSPExtractLocation>/</Web-JSPExtractLocation>
<Private-Package>org.apache.aries.samples.ariestrader.web.*</Private-Package>
Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html Fri Jan 14 22:17:36 2011
@@ -112,16 +112,16 @@
<TR>
<TD align="center"><FONT size="-1"><A href="PingJsp.jsp">PingJSP</A></FONT></TD>
<TD><FONT size="-1">PingJSP tests a direct call to JavaServer Page
- providing server-side dynamic HTML through JSP scripting.
- <B><P>Note: This test requires that the AriesTrader database is populated with fictitious
- stock quotes using the "(Re)-populate option from the configuration utilities</B>
- </FONT></TD>
+ providing server-side dynamic HTML through JSP scripting.</FONT></TD>
</TR>
<TR>
<TD align="center"><FONT size="-1"><A href="PingJspEL.jsp">PingJSPEL</A></FONT></TD>
<TD><FONT size="-1">PingJSPEL tests a direct call to JavaServer Page
providing server-side dynamic HTML through JSP scripting and the
- usage of the new JSP 2.0 Expression Language.</FONT></TD>
+ usage of the new JSP 2.0 Expression Language.
+ <B><P>Note: This test requires that the AriesTrader database is populated with fictitious
+ stock quotes using the "(Re)-populate option from the configuration utilities</B>
+ </FONT></TD>
</TR>
<TR>
<TD align="center"><FONT size="-1"><A href="servlet/PingServlet2Jsp">PingServlet2JSP</A></FONT></TD>
Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml Fri Jan 14 22:17:36 2011
@@ -102,6 +102,11 @@
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini Fri Jan 14 22:17:36 2011
@@ -22,9 +22,9 @@ asm-all-3.2.jar@start,\
pax-logging-api-1.4.jar@start,\
pax-logging-service-1.4.jar@start,\
derby-10.5.3.0_1.jar@start,\
-pax-web-jetty-bundle-0.7.2.jar@start,\
-pax-web-extender-war-0.7.2.jar@start,\
-pax-web-jsp-0.7.2.jar@start,\
+pax-web-jetty-bundle-0.8.1.jar@start,\
+pax-web-extender-war-0.8.1.jar@start,\
+pax-web-jsp-0.8.1.jar@start,\
org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
org.apache.aries.util-${ariesUtilVersion}.jar@start,\
org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
@@ -39,7 +39,7 @@ org.apache.aries.application.resolver.ob
org.apache.aries.application.noop.platform.repo-${ariesApplicationVersion}.jar@start,\
org.apache.aries.application.noop.postresolve.process-${ariesApplicationVersion}.jar@start,\
org.apache.aries.application.default.local.platform-${ariesApplicationVersion}.jar@start,\
-org.apache.felix.fileinstall-2.0.8.jar@start,\
+org.apache.felix.fileinstall-3.1.4.jar@start,\
org.apache.felix.bundlerepository-1.6.4.jar@start,\
org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
commons-collections-3.2.1.jar@start,\
@@ -49,6 +49,7 @@ geronimo-j2ee-connector_1.5_spec-2.0.0.j
geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\
geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\
geronimo-transaction-${geronimoTransactionVersion}.jar@start,\
+geronimo-servlet_2.5_spec-${geronimoServletVersion}.jar@start,\
openjpa-${openjpaVersion}.jar@start,\
org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\
Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java Fri Jan 14 22:17:36 2011
@@ -81,7 +81,7 @@ public class JdbcBlogSampleWithEbaTest e
System.out.println("In test and trying to get connection....");
*/
- HttpURLConnection conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+ HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog");
String response = getHTTPResponse(conn);
/* Uncomment for additional debug */
/*
@@ -128,6 +128,7 @@ public class JdbcBlogSampleWithEbaTest e
mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
+ mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
mavenBundle("org.apache.openjpa", "openjpa"),
mavenBundle("commons-lang", "commons-lang"),
Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java Fri Jan 14 22:17:36 2011
@@ -98,7 +98,7 @@ public class JpaBlogSampleWithEbaTest ex
System.out.println("In test and trying to get connection....");
*/
- HttpURLConnection conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+ HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog");
String response = getHTTPResponse(conn);
/* Uncomment for additional debug */
@@ -146,6 +146,7 @@ bootDelegationPackages("javax.transactio
mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
+ mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
mavenBundle("org.apache.openjpa", "openjpa"),
mavenBundle("commons-lang", "commons-lang"),
Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java Fri Jan 14 22:17:36 2011
@@ -101,7 +101,7 @@ public class QuiesceBlogSampleWithEbaTes
System.out.println("In test and trying to get connection....");
*/
- HttpURLConnection conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+ HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog");
String response = getHTTPResponse(conn);
/* Uncomment for additional debug */
@@ -165,7 +165,7 @@ public class QuiesceBlogSampleWithEbaTes
assertTrue("No services reistered for " + bds.getSymbolicName(), isServiceRegistered(bds));
assertTrue("No services reistered for " + txs.getSymbolicName(), isServiceRegistered(txs));
- conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+ conn = makeConnection("http://localhost:8080/blog/ViewBlog");
response = getHTTPResponse(conn);
assertEquals(HttpURLConnection.HTTP_OK,
@@ -206,6 +206,7 @@ bootDelegationPackages("javax.transactio
mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
+ mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
mavenBundle("org.apache.openjpa", "openjpa"),
mavenBundle("commons-lang", "commons-lang"),
Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-web/pom.xml?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-web/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-web/pom.xml Fri Jan 14 22:17:36 2011
@@ -50,7 +50,6 @@
<instructions>
<Web-ContextPath>/blog</Web-ContextPath>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-ClassPath>.</Bundle-ClassPath>
<Private-Package>org.apache.aries.samples.blog.web.*</Private-Package>
<Export-Package>!org.apache.aries.samples.blog.web.*</Export-Package>
<Import-Package>
Modified: aries/sandbox/jbohn/interceptor-proto/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/pom.xml?rev=1059187&r1=1059186&r2=1059187&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/pom.xml Fri Jan 14 22:17:36 2011
@@ -52,6 +52,8 @@
<geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion>
<geronimoJtaSpecVersion>1.1.1</geronimoJtaSpecVersion>
<geronimoTransactionVersion>2.1.3</geronimoTransactionVersion>
+ <geronimoServletVersion>1.2</geronimoServletVersion>
+ <aries.javadoc.exclude.packages>*</aries.javadoc.exclude.packages>
</properties>
<dependencyManagement>
@@ -82,17 +84,17 @@
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-extender-war</artifactId>
- <version>0.7.2</version>
+ <version>0.8.1</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
- <version>0.7.2</version>
+ <version>0.8.1</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jsp</artifactId>
- <version>0.7.2</version>
+ <version>0.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -178,7 +180,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
- <version>2.0.8</version>
+ <version>3.1.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>