[jbpm-commits] JBoss JBPM SVN: r6832 - in jbpm3/branches/jbpm-3.2-soa/tomcat: src/main/java/org/jbpm/realm and 1 other directory.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-11-17 19:46:30 -0500 (Wed, 17 Nov 2010)
New Revision: 6832

Modified:
   jbpm3/branches/jbpm-3.2-soa/tomcat/.classpath
   jbpm3/branches/jbpm-3.2-soa/tomcat/pom.xml
   jbpm3/branches/jbpm-3.2-soa/tomcat/src/main/java/org/jbpm/realm/DataSourceRealm.java
Log:
JBPM-2978 build jbpm-tomcat module against tomcat 5.5 and jdk 1.4

Modified: jbpm3/branches/jbpm-3.2-soa/tomcat/.classpath
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/tomcat/.classpath	2010-11-17 17:12:47 UTC (rev 6831)
+++ jbpm3/branches/jbpm-3.2-soa/tomcat/.classpath	2010-11-18 00:46:30 UTC (rev 6832)
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: jbpm3/branches/jbpm-3.2-soa/tomcat/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/tomcat/pom.xml	2010-11-17 17:12:47 UTC (rev 6831)
+++ jbpm3/branches/jbpm-3.2-soa/tomcat/pom.xml	2010-11-18 00:46:30 UTC (rev 6832)
@@ -11,32 +11,22 @@
     <version>3.2.10-SNAPSHOT</version>
   </parent>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
+  <properties>
+    <tomcat.version>5.5.23</tomcat.version>
+  </properties>
 
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
-    <!-- Provided dependencies -->
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
+      <groupId>tomcat</groupId>
       <artifactId>catalina</artifactId>
-      <version>6.0.29</version>
+      <version>${tomcat.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>naming-factory</artifactId>
+      <version>${tomcat.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: jbpm3/branches/jbpm-3.2-soa/tomcat/src/main/java/org/jbpm/realm/DataSourceRealm.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/tomcat/src/main/java/org/jbpm/realm/DataSourceRealm.java	2010-11-17 17:12:47 UTC (rev 6831)
+++ jbpm3/branches/jbpm-3.2-soa/tomcat/src/main/java/org/jbpm/realm/DataSourceRealm.java	2010-11-18 00:46:30 UTC (rev 6832)
@@ -191,14 +191,14 @@
     return new GenericPrincipal(this, username, null, null);
   }
 
-  private List<String> getRoles(Connection dbConnection, String username) {
+  private List getRoles(Connection dbConnection, String username) {
     PreparedStatement statement = null;
     try {
       statement = dbConnection.prepareStatement(roleQuery);
       statement.setString(1, username);
 
       ResultSet rs = statement.executeQuery();
-      List<String> roles = new ArrayList<String>();
+      List roles = new ArrayList();
       while (rs.next()) {
         roles.add(rs.getString(1));
       }