taylor 2004/02/29 18:04:05
Modified:
components/persistence/src/test/org/apache/jetspeed/components/persistence
TestPersistenceContainer.java
components/prefs/src/test/org/apache/jetspeed/prefs
TestPreferences.java TestPropertyManager.java
components/rdbms/src/test/org/apache/jetspeed/components
TestRDBMS.java
components/registry project.xml
components/registry/src/java/org/apache/jetspeed/components/portletentity
PortletEntityAccessComponentImpl.java
components/registry/src/test/org/apache/jetspeed/components/portletregistry
TestRegistry.java
Log:
Disable Entity access, its failing in OJB
Fixed cast exception in Entity access
gets further down and now PortletDefinitions no longer have PortletApplications
associated with them
Revision Changes Path
1.7 +1 -1
jakarta-jetspeed-2/components/persistence/src/test/org/apache/jetspeed/components/persistence/TestPersistenceContainer.java
Index: TestPersistenceContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/persistence/src/test/org/apache/jetspeed/components/persistence/TestPersistenceContainer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestPersistenceContainer.java 27 Feb 2004 20:26:58 -0000 1.6
+++ TestPersistenceContainer.java 1 Mar 2004 02:04:05 -0000 1.7
@@ -87,7 +87,7 @@
*/
public TestPersistenceContainer(String arg0)
{
- super(arg0);
+ super(arg0, "./src/test/Log4j.properties");
// TODO Auto-generated constructor stub
}
1.3 +1 -1
jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java
Index: TestPreferences.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestPreferences.java 28 Feb 2004 16:34:52 -0000 1.2
+++ TestPreferences.java 1 Mar 2004 02:04:05 -0000 1.3
@@ -66,7 +66,7 @@
*/
public TestPreferences(String testName)
{
- super(testName);
+ super(testName, "./src/test/Log4j.properties");
}
/**
1.3 +1 -1
jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java
Index: TestPropertyManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestPropertyManager.java 28 Feb 2004 16:35:11 -0000 1.2
+++ TestPropertyManager.java 1 Mar 2004 02:04:05 -0000 1.3
@@ -68,7 +68,7 @@
*/
public TestPropertyManager(String testName)
{
- super(testName);
+ super(testName, "./src/test/Log4j.properties");
}
/**
1.3 +1 -1
jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java
Index: TestRDBMS.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestRDBMS.java 27 Feb 2004 17:49:39 -0000 1.2
+++ TestRDBMS.java 1 Mar 2004 02:04:05 -0000 1.3
@@ -87,7 +87,7 @@
*/
public TestRDBMS(String name)
{
- super(name);
+ super(name, "./src/test/Log4j.properties");
}
public void testDBCP_1() throws Exception
{
1.5 +1 -1 jakarta-jetspeed-2/components/registry/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 25 Feb 2004 18:30:08 -0000 1.4
+++ project.xml 1 Mar 2004 02:04:05 -0000 1.5
@@ -250,7 +250,7 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <unitTestSourceDirectory>${basedir}/xsrc/test</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/Test*.java</include>
1.5 +4 -4
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponentImpl.java
Index: PortletEntityAccessComponentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponentImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortletEntityAccessComponentImpl.java 26 Feb 2004 22:50:41 -0000 1.4
+++ PortletEntityAccessComponentImpl.java 1 Mar 2004 02:04:05 -0000 1.5
@@ -129,13 +129,13 @@
public StoreablePortletEntityDelegate getPortletEntity(PortletDefinition
portletDefinition, String entityName)
{
ObjectID entityId =
JetspeedObjectID.createPortletEntityId(portletDefinition, entityName);
- PortletEntity portletEntity = getPortletEntity(entityId);
+ PortletEntity portletEntity = null; // TODO: DST: this is failing, need a
unit test for it: getPortletEntity(entityId);
if (portletEntity == null)
{
portletEntity = newPortletEntityInstance(portletDefinition);
((PortletEntityCtrl) portletEntity).setId(entityId.toString());
}
- return wrapEntity((PortletEntityImpl) portletEntity);
+ return (StoreablePortletEntityDelegate)portletEntity;
//wrapEntity(portletEntity);
}
/**
@@ -236,7 +236,7 @@
return pContainer.getStoreForThread(storeName);
}
- protected StoreablePortletEntityDelegate wrapEntity(PortletEntityImpl entity )
+ protected StoreablePortletEntityDelegate wrapEntity(PortletEntityImpl entity)
{
List list =(List)
((PreferenceSetImpl)entity.getPreferenceSet()).getInnerCollection();
return new StoreablePortletEntityDelegate(entity, entity, list,
getPersistenceStore());
1.5 +2 -2
jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistry.java
Index: TestRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestRegistry.java 27 Feb 2004 20:08:46 -0000 1.4
+++ TestRegistry.java 1 Mar 2004 02:04:05 -0000 1.5
@@ -215,7 +215,7 @@
*/
public TestRegistry(String testName)
{
- super(testName);
+ super(testName, "./src/test/Log4j.properties");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
