Author: jsdelfino
Date: Sun Mar 23 21:11:27 2008
New Revision: 640310
URL: http://svn.apache.org/viewvc?rev=640310&view=rev
Log:
Merged fix for TUSCANY-2121 from trunk SVN revision r640232.
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/pom.xml
incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/pom.xml?rev=640310&r1=640309&r2=640310&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/pom.xml
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/pom.xml
Sun Mar 23 21:11:27 2008
@@ -36,8 +36,4 @@
</dependency>
</dependencies>
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
</project>
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java?rev=640310&r1=640309&r2=640310&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
Sun Mar 23 21:11:27 2008
@@ -76,5 +76,10 @@
public void setData(D data) {
this.data = data;
}
+
+ //FIXME Temporary methods to make JAXB register the Item
+ // class when the Entry class is registered in a JAXB context
+ public void setDummy(Item item) {}
+ public Item getDummy() { return null; }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
