commit 6c52601a9a8abd9cb3ababbc7c420cac1fd402fe
author Tom Ware <tom.ware@oracle.com> Thu Dec 15 16:17:11 2011 +0000
committer Tom Ware <tom.ware@oracle.com> Thu Dec 15 16:17:11 2011 +0000
tree 0a67e5d0a3570aabb20c7fd33f5438bf9cd37927
parent 78af9fa02e18b1996e4f057ed4291f354e51a6f1

Testing of links

JPA-RS Incubator/tests/JPA-RS Tests/src/jpars/test/service/TestService.java

diff --git a/JPA-RS Incubator/tests/JPA-RS Tests/src/jpars/test/service/TestService.java b/JPA-RS Incubator/tests/JPA-RS Tests/src/jpars/test/service/TestService.java
index c786f0d..6d615df 100644
--- a/JPA-RS Incubator/tests/JPA-RS Tests/src/jpars/test/service/TestService.java
+++ b/JPA-RS Incubator/tests/JPA-RS Tests/src/jpars/test/service/TestService.java
@@ -15,6 +15,7 @@
 import static org.eclipse.persistence.jaxb.JAXBContext.MEDIA_TYPE;

 import static org.junit.Assert.fail;

 

+import java.beans.PropertyChangeListener;

 import java.io.ByteArrayInputStream;

 import java.io.ByteArrayOutputStream;

 import java.io.IOException;

@@ -43,6 +44,7 @@
 import jpars.test.util.TestURIInfo;

 

 import org.eclipse.persistence.dynamic.DynamicEntity;

+import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl;

 import org.eclipse.persistence.jaxb.JAXBContext;

 import org.eclipse.persistence.jaxb.JAXBMarshaller;

 import org.eclipse.persistence.jpa.JpaHelper;

@@ -380,18 +382,23 @@
         JAXBMarshaller marshaller = null;

         try{

             marshaller = (JAXBMarshaller)context.getJAXBContext().createMarshaller();

-          /*  marshaller.setListener(new Marshaller.Listener() {

+            marshaller.setListener(new Marshaller.Listener() {

                     @Override

                     public void beforeMarshal(Object source) {

+                        DynamicEntityImpl sourceImpl = (DynamicEntityImpl)source;

+                        PropertyChangeListener listener = sourceImpl._persistence_getPropertyChangeListener();

+                        sourceImpl._persistence_setPropertyChangeListener(null);

                         ((DynamicEntity)source).set("self", source);

+                        sourceImpl._persistence_setPropertyChangeListener(listener);

                     }

                 }

-            );*/

+            );

             marshaller.setProperty("eclipselink.media-type", mediaType);

             marshaller.setAdapter(new LinkAdapter("http://localhost:8080/JPA-RS/auction/entity/", context));

             marshaller.setProperty(JAXBContext.INCLUDE_ROOT, Boolean.FALSE);

             marshaller.marshal(object, writer);

         } catch (Exception e){

+            e.printStackTrace();

             fail(e.toString());

         }

         ByteArrayInputStream stream = new ByteArrayInputStream(writer.toString().getBytes());