[jboss-cvs] JBossAS SVN: r65024 - in projects/microcontainer/trunk: deployers-impl/src/tests/org/jboss/test/deployers/managed and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 3 21:35:44 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-09-03 21:35:44 -0400 (Mon, 03 Sep 2007)
New Revision: 65024
Modified:
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSMetaData.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/DeployersManagedTestSuite.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/DefaultFieldsImpl.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java
Log:
Fix the ManagedObject serialization
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSMetaData.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSMetaData.java 2007-09-04 00:04:43 UTC (rev 65023)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSMetaData.java 2007-09-04 01:35:44 UTC (rev 65024)
@@ -22,6 +22,7 @@
package org.jboss.test.deployers.deployer.support;
import java.io.Serializable;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -40,6 +41,7 @@
{
private static final long serialVersionUID = 1;
private String diplayName;
+ private URL fileUrl;
private List<String> aliases = new ArrayList<String>();
private List<ConnMetaData> deployments = new ArrayList<ConnMetaData>();
@@ -59,6 +61,16 @@
this.diplayName = diplayName;
}
+ @ManagementProperty(description="The ds.xml url", ignored=true)
+ public URL getUrl()
+ {
+ return fileUrl;
+ }
+ public void setUrl(URL fileUrl)
+ {
+ this.fileUrl = fileUrl;
+ }
+
public List<String> getAliases()
{
return aliases;
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/DeployersManagedTestSuite.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/DeployersManagedTestSuite.java 2007-09-04 00:04:43 UTC (rev 65023)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/DeployersManagedTestSuite.java 2007-09-04 01:35:44 UTC (rev 65024)
@@ -25,6 +25,7 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+import org.jboss.test.deployers.managed.test.DeployerManagedDeploymentUnitTestCase;
import org.jboss.test.deployers.managed.test.DeployerManagedObjectUnitTestCase;
/**
@@ -45,6 +46,7 @@
TestSuite suite = new TestSuite("Deployers Managed Tests");
suite.addTest(DeployerManagedObjectUnitTestCase.suite());
+ suite.addTest(DeployerManagedDeploymentUnitTestCase.suite());
return suite;
}
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java 2007-09-04 00:04:43 UTC (rev 65023)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java 2007-09-04 01:35:44 UTC (rev 65024)
@@ -21,6 +21,11 @@
*/
package org.jboss.test.deployers.managed.test;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
@@ -82,8 +87,8 @@
ManagedObject mo = mof.createManagedObject(DSMetaData.class);
Map<String, ManagedProperty> props = mo.getProperties();
- assertEquals(2, props.size());
-
+ log.info("DSMetaData props: "+props);
+ assertEquals(3, props.size());
}
public void testManagedDeployment()
@@ -98,6 +103,8 @@
// Deploy a datasource with local and xa factories
Deployment ctx1 = createSimpleDeployment("deployment1");
DSMetaData dsmd = new DSMetaData();
+ dsmd.setDiplayName("deployment1 DS");
+ // TODO: dsmd.setUrl(new URL("vfsfile:/tmp/some-ds.xml"));
// The base LocalDataSourceMeta
LocalDataSourceMetaData ds = new LocalDataSourceMetaData();
ds.setJndiName("java:DefaultDS1");
@@ -157,6 +164,21 @@
// Validate the deployment1 ManagedObjects
ManagedDeployment mo1 = ps.getManagedDeployment("deployment1");
+ validateDeployment1(mo1, ps);
+
+ // Validate that the ManagedDeployment is serializable
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(mo1);
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ ManagedDeployment mo1test = (ManagedDeployment) ois.readObject();
+ validateDeployment1(mo1test, ps);
+ }
+
+ protected void validateDeployment1(ManagedDeployment mo1, MockProfileService ps)
+ {
+ // Validate the deployment1 ManagedObjects
assertNotNull("deployment1 ManagedDeployment", mo1);
ManagedProperty deploymentsProp = mo1.getProperty("deployments");
assertNotNull("deployments prop", deploymentsProp);
@@ -285,7 +307,7 @@
ManagedProperty rtp1 = localDataProps.get("runtimeProp1");
assertNotNull("runtimeProp1", rtp1);
ManagedProperty rtp2 = localDataProps.get("runtimeProp2");
- assertNotNull("runtimeProp2", rtp2);
+ assertNotNull("runtimeProp2", rtp2);
}
protected DeployerClient getMainDeployer()
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/DefaultFieldsImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/DefaultFieldsImpl.java 2007-09-04 00:04:43 UTC (rev 65023)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/DefaultFieldsImpl.java 2007-09-04 01:35:44 UTC (rev 65024)
@@ -21,8 +21,10 @@
*/
package org.jboss.managed.plugins;
+import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
import org.jboss.managed.api.Fields;
@@ -286,4 +288,19 @@
throw new IllegalStateException("Field " + fieldName + " with value " + field + " is a of the expected type: " + expected.getName());
}
+ /*
+ private void writeObject(java.io.ObjectOutputStream out)
+ throws IOException
+ {
+ for (Map.Entry<String, Serializable> entry : fields.entrySet())
+ {
+
+ }
+ }
+ private void readObject(java.io.ObjectInputStream in)
+ throws IOException, ClassNotFoundException
+ {
+
+ }
+ */
}
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java 2007-09-04 00:04:43 UTC (rev 65023)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java 2007-09-04 01:35:44 UTC (rev 65024)
@@ -51,6 +51,7 @@
* - int version
* - Fields fields
* - ManagedObject managedObject
+ * - ManagedObject targetManagedObject
*/
private static final int VERSION1 = 1;
/** The serialization version used by writeObject */
@@ -394,6 +395,7 @@
out.writeInt(STREAM_VERSION);
out.writeObject(fields);
out.writeObject(managedObject);
+ out.writeObject(targetManagedObject);
}
/**
@@ -409,5 +411,6 @@
if (name == null)
throw new IOException("No " + Fields.NAME + " in fields");
managedObject = (ManagedObject) in.readObject();
+ targetManagedObject = (ManagedObject) in.readObject();
}
}
More information about the jboss-cvs-commits
mailing list