Index: app-servers/security/jboss/project.xml
===================================================================
--- app-servers/security/jboss/project.xml (revision 240049)
+++ app-servers/security/jboss/project.xml (working copy)
@@ -56,7 +56,7 @@
ojb:db-ojb
- 1.0.1
+ 1.0.3
true
@@ -154,4 +154,27 @@
+
+ src/java
+
+
+ ${basedir}/src/java
+
+ **/*.java
+
+
+
+ ${basedir}/../../../etc/db-ojb
+
+ repository.xml
+ repository_database.xml
+ repository_internal.xml
+ *.dtd
+ *.properties
+
+ false
+
+
+
+
Index: app-servers/security/jboss/maven.xml
===================================================================
--- app-servers/security/jboss/maven.xml (revision 240049)
+++ app-servers/security/jboss/maven.xml (working copy)
@@ -18,11 +18,10 @@
-
+
-
-
-
+
+
Index: app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-spi.xml
===================================================================
--- app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-spi.xml (revision 0)
+++ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-spi.xml (revision 0)
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+ JETSPEED-INF/ojb/security_repository.xml
+ JetspeedSecurityServiceDS
+
+
+
+
+ org.apache.jetspeed.security.spi.SecurityAccess
+
+
+
+
+
+ DefaultAuthenticator
+
+
+
+
+ JdbcMetadataUtils object.
- */
- public JdbcMetadataUtils()
- {
- // Note that currently Sapdb and MaxDB have equal subprotocols and
- // drivers so we have no means to distinguish them
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_DB2, PLATFORM_DB2);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_DB2_INET, PLATFORM_DB2);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_FIREBIRD, PLATFORM_FIREBIRD);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_HSQLDB, PLATFORM_HSQLDB);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_INFORMIX, PLATFORM_INFORMIX);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MAXDB, PLATFORM_MAXDB);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER_INET, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER6_INET, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER7_INET, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER7A_INET, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER_INET_POOLED, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER6_INET_POOLED, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER7_INET_POOLED, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER7A_INET_POOLED, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MSSQLSERVER_JTDS, PLATFORM_MSSQLSERVER);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_MYSQL, PLATFORM_MYSQL);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_ORACLE, PLATFORM_ORACLE);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_ORACLE_INET, PLATFORM_ORACLE);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_POSTGRESQL, PLATFORM_POSTGRESQL);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_SYBASE, PLATFORM_SYBASE);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_SYBASE_INET, PLATFORM_SYBASE);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_SYBASE_INET_POOLED, PLATFORM_SYBASE);
- jdbcSubProtocolToPlatform.put(SUBPROTOCOL_SYBASE_JTDS, PLATFORM_SYBASE);
-
- jdbcDriverToPlatform.put(DRIVER_DB2, PLATFORM_DB2);
- jdbcDriverToPlatform.put(DRIVER_DB2_INET, PLATFORM_DB2);
- jdbcDriverToPlatform.put(DRIVER_FIREBIRD, PLATFORM_FIREBIRD);
- jdbcDriverToPlatform.put(DRIVER_HSQLDB, PLATFORM_HSQLDB);
- jdbcDriverToPlatform.put(DRIVER_INFORMIX, PLATFORM_INFORMIX);
- jdbcDriverToPlatform.put(DRIVER_MAXDB, PLATFORM_MAXDB);
- jdbcDriverToPlatform.put(DRIVER_MCKOI, PLATFORM_MCKOI);
- jdbcDriverToPlatform.put(DRIVER_MSSQLSERVER, PLATFORM_MSSQLSERVER);
- jdbcDriverToPlatform.put(DRIVER_MSSQLSERVER_INET, PLATFORM_MSSQLSERVER);
- jdbcDriverToPlatform.put(DRIVER_MSSQLSERVER_JSQLCONNECT, PLATFORM_MSSQLSERVER);
- jdbcDriverToPlatform.put(DRIVER_MYSQL, PLATFORM_MYSQL);
- jdbcDriverToPlatform.put(DRIVER_MYSQL_OLD, PLATFORM_MYSQL);
- jdbcDriverToPlatform.put(DRIVER_ORACLE, PLATFORM_ORACLE);
- jdbcDriverToPlatform.put(DRIVER_ORACLE_INET, PLATFORM_ORACLE);
- jdbcDriverToPlatform.put(DRIVER_POSTGRESQL, PLATFORM_POSTGRESQL);
- jdbcDriverToPlatform.put(DRIVER_SYBASE, PLATFORM_SYBASE);
- jdbcDriverToPlatform.put(DRIVER_SYBASE_OLD, PLATFORM_SYBASE);
- jdbcDriverToPlatform.put(DRIVER_SYBASE_INET, PLATFORM_SYBASE);
- }
-
- /**
- * Fills parameters of the given {@link JdbcConnectionDescriptor} with metadata extracted from the given datasource.
- *
- * @param jcd
- * The jdbc connection descriptor to fill
- * @param dataSource
- * The data source
- * @param username
- * The username required to establish a connection via the data source Can be empty if the data source
- * does not require it or if one is specified in the jdbc connection descriptor
- * @param password
- * The username required to establish a connection via the data source Can be empty if the data source or
- * username does not require it or if one is specified in the jdbc connection descriptor
- */
- public void fillJCDFromDataSource(JdbcConnectionDescriptor jcd, DataSource dataSource, String username,
- String password) throws MetadataException
- {
- String realUsername = (jcd.getUserName() != null ? jcd.getUserName() : username);
- String realPassword = (jcd.getPassWord() != null ? jcd.getPassWord() : password);
- Connection connection = null;
- DatabaseMetaData metadata = null;
-
- try
- {
- // we have to open a connection to be able to retrieve metadata
- if (realUsername != null)
- {
- connection = dataSource.getConnection(realUsername, realPassword);
- }
- else
- {
- connection = dataSource.getConnection();
- }
-
- metadata = connection.getMetaData();
- }
- catch (Throwable t)
- {
- if (connection != null)
- {
- try
- {
- connection.close();
- }
- catch (SQLException ex)
- {
- }
- }
- throw new MetadataException("Could not get the metadata from the given datasource", t);
- }
-
- try
- {
- HashMap urlComponents = parseConnectionUrl(metadata.getURL());
-
- if (urlComponents.containsKey(PROPERTY_DBALIAS))
- {
- jcd.setProtocol((String) urlComponents.get(PROPERTY_PROTOCOL));
- jcd.setSubProtocol((String) urlComponents.get(PROPERTY_SUBPROTOCOL));
- jcd.setDbAlias((String) urlComponents.get(PROPERTY_DBALIAS));
- if (jdbcSubProtocolToPlatform.containsKey(jcd.getSubProtocol()))
- {
- // TODO: We might be able to use this: metadata.getDatabaseProductName();
- jcd.setDbms((String) jdbcSubProtocolToPlatform.get(jcd.getSubProtocol()));
- }
- }
- }
- catch (Throwable t)
- {
- try
- {
- connection.close();
- }
- catch (SQLException ex)
- {
- }
- throw new MetadataException("Could not get the metadata from the given datasource", t);
- }
- try
- {
- // this will only work with JDK >= 1.4 and only with some jdbc drivers
- Integer majorVersion = (Integer) PropertyUtils.getProperty(metadata, "JDBCMajorVersion");
- Integer minorVersion = (Integer) PropertyUtils.getProperty(metadata, "JDBCMinorVersion");
-
- jcd.setJdbcLevel(Double.parseDouble(majorVersion.toString() + "." + minorVersion.toString()));
- }
- catch (Throwable t)
- {
- // otherwise we're assuming JDBC 2.0 compliance
- jcd.setJdbcLevel(2.0);
- }
- try
- {
- connection.close();
- }
- catch (SQLException ex)
- {
- }
- }
-
- /**
- * Splits the given jdbc connection url into its components and puts them into a hash map using the
- * PROPERTY_ constants.
- *
- * @param jdbcConnectionUrl
- * The connection url
- * @return The properties
- */
- public HashMap parseConnectionUrl(String jdbcConnectionUrl)
- {
- HashMap result = new HashMap();
-
- if (jdbcConnectionUrl == null)
- {
- return result;
- }
-
- int pos = jdbcConnectionUrl.indexOf(':');
- int lastPos;
-
- result.put(PROPERTY_PROTOCOL, jdbcConnectionUrl.substring(0, pos));
-
- lastPos = pos;
- pos = jdbcConnectionUrl.indexOf(':', lastPos + 1);
-
- String subProtocol = jdbcConnectionUrl.substring(lastPos + 1, pos);
-
- // there are a few jdbc drivers that have a subprotocol containing one or more ':'
- if ("inetpool".equals(subProtocol))
- {
- // Possible forms are:
- // inetpool:
- // inetpool:jdbc: (where we'll remove the 'jdbc' part)
-
- int tmpPos = jdbcConnectionUrl.indexOf(':', pos + 1);
-
- if ("inetpool:jdbc".equals(jdbcConnectionUrl.substring(lastPos + 1, tmpPos)))
- {
- pos = tmpPos;
- tmpPos = jdbcConnectionUrl.indexOf(':', pos + 1);
- }
- subProtocol += ":" + jdbcConnectionUrl.substring(pos + 1, tmpPos);
- }
- else if ("jtds".equals(subProtocol) || "microsoft".equals(subProtocol) || "sybase".equals(subProtocol))
- {
- pos = jdbcConnectionUrl.indexOf(':', pos + 1);
- subProtocol = ":" + jdbcConnectionUrl.substring(lastPos + 1, pos);
- }
-
- result.put(PROPERTY_SUBPROTOCOL, subProtocol);
- result.put(PROPERTY_DBALIAS, jdbcConnectionUrl.substring(pos + 1));
-
- return result;
- }
-
- /**
- * Derives the OJB platform to use for a database that is connected via a url using the specified subprotocol, and
- * where the specified jdbc driver is used.
- *
- * @param jdbcSubProtocol
- * The JDBC subprotocol used to connect to the database
- * @param jdbcDriver
- * The JDBC driver used to connect to the database
- * @return The platform identifier or null if no platform could be found
- */
- public String findPlatformFor(String jdbcSubProtocol, String jdbcDriver)
- {
- String platform = (String) jdbcSubProtocolToPlatform.get(jdbcSubProtocol);
-
- if (platform == null)
- {
- platform = (String) jdbcDriverToPlatform.get(jdbcDriver);
- }
- return platform;
- }
-}
Index: app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/JetspeedSecurityService.java
===================================================================
--- app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/JetspeedSecurityService.java (revision 240049)
+++ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/JetspeedSecurityService.java (working copy)
@@ -14,8 +14,6 @@
*/
package org.apache.jetspeed.appservers.security.jboss;
-import java.util.Iterator;
-
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -23,22 +21,20 @@
import org.apache.jetspeed.security.UserManager;
import org.apache.ojb.broker.PBKey;
-import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl;
-import org.apache.ojb.broker.accesslayer.ConnectionManagerFactory;
import org.apache.ojb.broker.metadata.ConnectionPoolDescriptor;
import org.apache.ojb.broker.metadata.ConnectionRepository;
import org.apache.ojb.broker.metadata.JdbcConnectionDescriptor;
+import org.apache.ojb.broker.metadata.JdbcMetadataUtils;
import org.apache.ojb.broker.metadata.MetadataManager;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
-import org.springframework.orm.ojb.OjbFactoryUtils;
public class JetspeedSecurityService implements JetspeedSecurityServiceMBean
{
- private final String JCD_ALIAS = "jetspeed-security-service";
+ private final String JCD_ALIAS = "JetspeedSecurityServiceDS";
private GenericApplicationContext ctx;
@@ -62,7 +58,7 @@
ConnectionRepository cr = MetadataManager.getInstance().connectionRepository();
cr.addDescriptor(jcd);
}
- // Instatiate application
+ // Instatiating application
ctx = new GenericApplicationContext();
XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(ctx);
xmlReader.loadBeanDefinitions(new ClassPathResource("META-INF/jboss-secsvc/jboss-security-service.xml"));
@@ -83,7 +79,6 @@
*/
public void setDataSourceJndiName(String jndiName)
{
- boolean newJcd = false;
JdbcConnectionDescriptor jcd = findJcd();
try
{
@@ -119,7 +114,6 @@
*/
public UserManager getUserManager()
{
- // TODO Auto-generated method stub
UserManager um = (UserManager) ctx.getBean("org.apache.jetspeed.security.UserManager");
return um;
}