You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2002/09/14 02:10:25 UTC
cvs commit: jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/connector/database DatabaseSession.java
mcconnell 2002/09/13 17:10:25
Modified: enterprise/pss build.xml
enterprise/pss/src/etc pss.mf
enterprise/pss/src/java/org/apache/pss Connector.java
ConnectorContext.java DefaultConnectorContext.java
DefaultSessionContext.java ORB.java ORB.xinfo
enterprise/pss/src/java/org/apache/pss/connector
ConnectorBase.java
enterprise/pss/src/java/org/apache/pss/connector/database
DatabaseSession.java
Log:
Updated code base to use a context classloader.
Revision Changes Path
1.11 +3 -4 jakarta-avalon-apps/enterprise/pss/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 8 Sep 2002 16:10:13 -0000 1.10
+++ build.xml 14 Sep 2002 00:10:24 -0000 1.11
@@ -51,7 +51,7 @@
<property name="MAJOR" value="2"/>
<property name="MINOR" value="0"/>
<property name="MICRO" value="1"/>
- <property name="VERSION" value="${MAJOR}.${MINOR}.${MICRO}"/>
+ <property name="VERSION" value="${MAJOR}.${MINOR}"/>
<property name="compiler.jar" value="psdl-${VERSION}.jar"/>
<property name="pss.jar" value="pss-${VERSION}.jar"/>
@@ -65,7 +65,6 @@
<!-- ORB package dependecies -->
<property name="orb.path" value="${enterprise}/orb" />
<property name="orb.lib.path" value="${orb.path}/lib" />
- <property name="orb.dist.path" value="${orb.path}/dist" />
<!-- OTS package dependecies -->
<property name="ots.path" value="${enterprise}/ots" />
@@ -83,7 +82,7 @@
<!-- javadoc references -->
<property name="overview.html" value="${etc}/overview.html" />
<property name="javadoc.root.path" value="${dist}/javadoc" />
- <property name="orb.href" value="${orb.dist.path}/javadoc" />
+ <property name="orb.href" value="${javadoc.root.path}/orb" />
<property name="avalon.href" value="http://jakarta.apache.org/avalon/api/" />
<property name="jdk.href" value="http://java.sun.com/j2se/1.4/docs/api/" />
@@ -92,7 +91,7 @@
<fileset dir="${orb.lib.path}">
<include name="*.jar" />
</fileset>
- <fileset dir="${orb.dist.path}">
+ <fileset dir="${orb.path}/build">
<include name="*.jar" />
</fileset>
<fileset dir="${ots.lib.path}">
1.2 +11 -2 jakarta-avalon-apps/enterprise/pss/src/etc/pss.mf
Index: pss.mf
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/etc/pss.mf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pss.mf 7 Sep 2002 06:59:02 -0000 1.1
+++ pss.mf 14 Sep 2002 00:10:24 -0000 1.2
@@ -1,5 +1,14 @@
Manifest-Version: 1.0
-Created-By: OSM SARL
+Extension-Name: apache-pss
+Specification-Vendor: Object Management Group
+Specification-Title: PSS
+Specification-Version: 1.0
+Implementation-Vendor-Id: ASF
+Implementation-Vendor: Apache Softeware Foundation
+Implementation-Version: 2.0
+Extension-List: orb
+orb-Extension-Name: apache-orb
+orb-Specification-Version: 2.4
Name: org/apache/pss/ORB.class
-Avalon-Block: true
+Avalon: Type
1.4 +0 -1 jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/Connector.java
Index: Connector.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/Connector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Connector.java 8 Sep 2002 16:10:13 -0000 1.3
+++ Connector.java 14 Sep 2002 00:10:24 -0000 1.4
@@ -16,7 +16,6 @@
*/
public interface Connector extends org.omg.CosPersistentState.Connector
{
-
/**
* Register implementations for PSDL storage types and home with
* the connector using a configuration argument.
1.4 +1 -1 jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/ConnectorContext.java
Index: ConnectorContext.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/ConnectorContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConnectorContext.java 18 May 2002 13:27:48 -0000 1.3
+++ ConnectorContext.java 14 Sep 2002 00:10:24 -0000 1.4
@@ -18,7 +18,7 @@
* @author <a href="mailto:mcconnell@osm.net">Stephen McConnell</a>
*/
-public interface ConnectorContext extends POAContext
+public interface ConnectorContext
{
//=================================================================
// static
1.4 +6 -26 jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/DefaultConnectorContext.java
Index: DefaultConnectorContext.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/DefaultConnectorContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultConnectorContext.java 18 May 2002 13:27:48 -0000 1.3
+++ DefaultConnectorContext.java 14 Sep 2002 00:10:24 -0000 1.4
@@ -7,8 +7,8 @@
package org.apache.pss;
-import org.apache.orb.DefaultORBContext;
import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.CascadingRuntimeException;
import org.omg.PortableServer.POA;
@@ -20,7 +20,7 @@
* @author <a href="mailto:mcconnell@osm.net">Stephen McConnell</a>
*/
-public class DefaultConnectorContext extends DefaultORBContext
+public class DefaultConnectorContext extends DefaultContext
implements ConnectorContext
{
@@ -33,9 +33,9 @@
* @param orb the current ORB
* @param connector the PSS connector
*/
- public DefaultConnectorContext( ORB orb, Connector connector )
+ public DefaultConnectorContext( Connector connector )
{
- this( orb, connector, null );
+ this( connector, null );
}
/**
@@ -44,9 +44,9 @@
* @param connector the PSS connector
* @param parent the parent context
*/
- public DefaultConnectorContext( ORB orb, Connector connector, Context parent )
+ public DefaultConnectorContext( Connector connector, Context parent )
{
- super( orb, parent );
+ super( parent );
put( ConnectorContext.CONNECTOR_KEY, connector );
}
@@ -65,24 +65,4 @@
return (Connector) get( ConnectorContext.CONNECTOR_KEY );
}
- //=================================================================
- // POAContext
- //=================================================================
-
- /**
- * Returns the relative root POA.
- * @return POA the root POA
- */
- public POA getPOA()
- {
- try
- {
- return (POA) getORB().resolve_initial_references("RootPOA");
- }
- catch( Throwable e )
- {
- throw new CascadingRuntimeException(
- "Unexpected exception while resoplving POA", e );
- }
- }
}
1.4 +4 -4 jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/DefaultSessionContext.java
Index: DefaultSessionContext.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/DefaultSessionContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSessionContext.java 18 May 2002 13:27:48 -0000 1.3
+++ DefaultSessionContext.java 14 Sep 2002 00:10:24 -0000 1.4
@@ -31,9 +31,9 @@
* @param connector the PSS connector
* @param session the PSS session
*/
- public DefaultSessionContext( ORB orb, Connector connector, Session session )
+ public DefaultSessionContext( Connector connector, Session session )
{
- this( orb, connector, session, null );
+ this( connector, session, null );
}
/**
@@ -43,9 +43,9 @@
* @param session the PSS session
* @param parent the parent context
*/
- public DefaultSessionContext( ORB orb, Connector connector, Session session, Context parent )
+ public DefaultSessionContext( Connector connector, Session session, Context parent )
{
- super( orb, connector, parent );
+ super( connector, parent );
put( SessionContext.SESSION_KEY, session );
}
1.4 +2 -3 jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/ORB.java
Index: ORB.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/ORB.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ORB.java 18 May 2002 13:27:48 -0000 1.3
+++ ORB.java 14 Sep 2002 00:10:24 -0000 1.4
@@ -10,7 +10,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.CascadingException;
-import org.apache.orb.ORBContext;
import org.apache.orb.POAContext;
import org.omg.CosPersistentState.ConnectorHelper;
@@ -35,7 +34,7 @@
* </td></tr>
* @author <a href="mailto:mcconnell@osm.net">Stephen McConnell</a>
*/
-public class ORB extends org.apache.orb.ORB implements ConnectorContext, POAContext, ORBContext
+public class ORB extends org.apache.orb.ORB implements ConnectorContext, POAContext
{
private Configuration m_config;
@@ -98,7 +97,7 @@
getLogger().debug(
"created PSS " + mode + " connector" );
}
- m_connectorContext = new DefaultConnectorContext( this, m_connector );
+ m_connectorContext = new DefaultConnectorContext( m_connector );
}
catch( Throwable e )
{
1.7 +8 -11 jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/ORB.xinfo
Index: ORB.xinfo
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/ORB.xinfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ORB.xinfo 8 Sep 2002 16:10:13 -0000 1.6
+++ ORB.xinfo 14 Sep 2002 00:10:24 -0000 1.7
@@ -1,13 +1,7 @@
<?xml version="1.0"?>
-
-<!--
- File: ORB.xinfo
- License: etc/LICENSE.TXT
- Copyright: Copyright (C) The Apache Software Foundation. All rights reserved.
- Copyright: OSM SARL 2001-2002, All Rights Reserved.
- @author Stephen McConnell
- @version 1.0 12/03/2001
--->
+<!DOCTYPE type
+ PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
+ "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd" >
<type>
@@ -17,13 +11,16 @@
<services>
<service>
- <reference type="org.apache.orb.ORB" version="2.4"/>
+ <reference type="org.apache.pss.ORB" version="2.4"/>
</service>
<service>
- <reference type="org.apache.pss.ORB" version="2.4"/>
+ <reference type="org.apache.orb.ORB" version="2.4"/>
</service>
<service>
<reference type="org.apache.pss.ConnectorContext"/>
+ </service>
+ <service>
+ <reference type="org.apache.orb.POAContext" />
</service>
</services>
1.4 +5 -2 jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/connector/ConnectorBase.java
Index: ConnectorBase.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/connector/ConnectorBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConnectorBase.java 8 Sep 2002 16:10:13 -0000 1.3
+++ ConnectorBase.java 14 Sep 2002 00:10:25 -0000 1.4
@@ -426,6 +426,9 @@
private void register( Configuration config, int mode )
{
+
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
try
{
String key = "";
@@ -466,11 +469,11 @@
if( mode == STORAGE_HOME_MODE )
{
- register_storage_home_factory( psdl, Class.forName( value ) );
+ register_storage_home_factory( psdl, loader.loadClass( value ) );
}
else
{
- register_storage_object_factory( psdl, Class.forName( value ) );
+ register_storage_object_factory( psdl, loader.loadClass( value ) );
}
}
}
1.3 +1 -1 jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseSession.java
Index: DatabaseSession.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseSession.java 12 Mar 2002 22:18:02 -0000 1.2
+++ DatabaseSession.java 14 Sep 2002 00:10:25 -0000 1.3
@@ -837,7 +837,7 @@
{
try
{
- Class.forName( s2 ).newInstance();
+ Thread.currentThread().getContextClassLoader().loadClass( s2 ).newInstance();
}
catch ( Exception exception )
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>