geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r818514 - in /geronimo/sandbox/jbohn/daytrader-bp: assemblies/web/daytrader-web-jdbc/ modules/core/ modules/core/src/main/resources/OSGI-INF/blueprint/ modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/util/
Date Thu, 24 Sep 2009 15:17:05 GMT
Author: jbohn
Date: Thu Sep 24 15:17:05 2009
New Revision: 818514

URL: http://svn.apache.org/viewvc?rev=818514&view=rev
Log:
some cleanup

Modified:
    geronimo/sandbox/jbohn/daytrader-bp/assemblies/web/daytrader-web-jdbc/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp/modules/core/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    geronimo/sandbox/jbohn/daytrader-bp/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/util/ServletUtilities.java

Modified: geronimo/sandbox/jbohn/daytrader-bp/assemblies/web/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp/assemblies/web/daytrader-web-jdbc/pom.xml?rev=818514&r1=818513&r2=818514&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp/assemblies/web/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp/assemblies/web/daytrader-web-jdbc/pom.xml Thu Sep
24 15:17:05 2009
@@ -55,11 +55,6 @@
             <artifactId>daytrader-web</artifactId>
             <version>${version}</version>
         </dependency>
-        <!--<dependency>-->
-            <!-- we need to include this in the image for logging to work -->
-            <!--<groupId>commons-logging</groupId>-->
-            <!--<artifactId>commons-logging</artifactId>-->
-        <!--</dependency>-->
 
         <!-- web container provided specs -->
         <dependency>
@@ -85,35 +80,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Not required for Bean version of TradeDirect
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-        </dependency>
-        -->
     </dependencies>
 
     <repositories>
@@ -180,13 +146,7 @@
                   <Import-Package>
                       org.apache.geronimo.samples.daytrader.beans;version=1.0,
                       org.apache.geronimo.samples.daytrader.core;version=1.0,
-<!--
-                      org.apache.geronimo.samples.daytrader.core.direct;version=1.0,
--->
                       org.apache.geronimo.samples.daytrader.util;version=1.0
-<!--
-                      *
--->
                   </Import-Package>
                 </instructions>
                 <unpackBundle>true</unpackBundle>

Modified: geronimo/sandbox/jbohn/daytrader-bp/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp/modules/core/pom.xml?rev=818514&r1=818513&r2=818514&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp/modules/core/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp/modules/core/pom.xml Thu Sep 24 15:17:05 2009
@@ -49,27 +49,6 @@
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-entities</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
--->
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.daytrader</groupId>
-            <artifactId>daytrader-wsappclient</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
--->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
@@ -95,13 +74,6 @@
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-<!--
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
--->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -112,26 +84,6 @@
             <artifactId>openjpa</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- OpenJPA PCEnhancer depends
-        <dependency>
-            <groupId>net.sourceforge.serp</groupId>
-            <artifactId>serp</artifactId>
-            <version>1.13.1</version>
-            <scope>provided</scope>
-        </dependency> 
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
-            <scope>provided</scope>
-        </dependency>
-        end OpenJPA PCEnhancer depends -->
     </dependencies>
 
     <build>
@@ -141,54 +93,6 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-<!--
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <configuration>
-                            <tasks>
-                                <path id="enhance.path.ref">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="*Bean*/*.class"/>
-                                    </fileset>
-                                </path>
-                                <pathconvert property="enhance.files"
-                                             refid="enhance.path.ref"
-                                             pathsep=" "/>
-                                <java classname="org.apache.openjpa.enhance.PCEnhancer">
-                                    <arg line="-p persistence.xml"/>
-                                    <arg line="${enhance.files}"/>
-                                    <classpath>
-                                        <path refid="maven.dependency.classpath"/>
-                                        <path refid="maven.compile.classpath"/>
-                                    </classpath>
-                                </java>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ejb-plugin</artifactId>
-                <configuration>
-                    <generateClient>true</generateClient>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>wsappclient.jar</Class-Path>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
--->
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -196,13 +100,10 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.apache.geronimo.samples.daytrader.core;version=1.0.0,
-                            org.apache.geronimo.samples.daytrader.core.direct;version=1.0.0
+                            org.apache.geronimo.samples.daytrader.core;version=1.0.0
                         </Export-Package>
                         <Import-Package>
                             org.apache.geronimo.samples.daytrader.beans;version=1.0,
-                            org.apache.geronimo.samples.daytrader.core;version=1.0,
-                            org.apache.geronimo.samples.daytrader.core.direct;version=1.0,
                             org.apache.geronimo.samples.daytrader.util;version=1.0,
                             javax.persistence;version=1.0.0,
                             javax.naming,

Modified: geronimo/sandbox/jbohn/daytrader-bp/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=818514&r1=818513&r2=818514&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Thu Sep 24 15:17:05 2009
@@ -4,13 +4,13 @@
   
   <service id="tradeDBService" ref="tradeServiceComponent" interface="org.apache.geronimo.samples.daytrader.core.TradeDBServices">
       <service-properties>
-          <entry key="mode" value="0"/>
+          <entry key="mode" value="jdbc"/>
       </service-properties>
   </service>
 
   <service id="tradeService" ref="tradeServiceComponent" interface="org.apache.geronimo.samples.daytrader.core.TradeServices">
       <service-properties>
-          <entry key="mode" value="0"/>
+          <entry key="mode" value="jdbc"/>
       </service-properties>
   </service>
 

Modified: geronimo/sandbox/jbohn/daytrader-bp/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/util/ServletUtilities.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/util/ServletUtilities.java?rev=818514&r1=818513&r2=818514&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/util/ServletUtilities.java
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/util/ServletUtilities.java
Thu Sep 24 15:17:05 2009
@@ -33,6 +33,7 @@
  */
 public class ServletUtilities {
 
+    private static String filter = "/(mode=jdbc)";
     /**
      * Lookup and return the TradeServices osgi service
      * 
@@ -47,7 +48,7 @@
     {
         try {
             InitialContext ic = new InitialContext();
-            return (TradeServices) ic.lookup("osgi:services/" + TradeServices.class.getName());
+            return (TradeServices) ic.lookup("osgi:services/" + TradeServices.class.getName()
+ filter);
         } catch (NamingException e) {
             e.printStackTrace();
             IOException ioe = new IOException("Unable to retrieve TradeServices service");
@@ -70,7 +71,7 @@
     {
         try {
             InitialContext ic = new InitialContext();
-            return (TradeDBServices) ic.lookup("osgi:services/" + TradeDBServices.class.getName());
+            return (TradeDBServices) ic.lookup("osgi:services/" + TradeDBServices.class.getName()
+ filter);
         } catch (NamingException e) {
             e.printStackTrace();
             IOException ioe = new IOException("Unable to retrieve TradeDBServices service");



Mime
View raw message