You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/05/21 00:01:24 UTC
[1/2] git commit: ISIS-714: fixing manifest so that Isis custom
mappings for DN picked up
Repository: isis
Updated Branches:
refs/heads/master 27144fc30 -> b8d4afcf9
ISIS-714: fixing manifest so that Isis custom mappings for DN picked up
... in addition (related):
* changing IsisBlobMapping to define its bytes as a java.io.Serializable column (maps to BLOB) rather than byte[] column (has no default mapping, so crashes and burns)
* update ToDoItem.java with additional JDO metadata to name the 3 inlined columns
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/add5fff7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/add5fff7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/add5fff7
Branch: refs/heads/master
Commit: add5fff7ab7ecf8cfc9b809baf73dad37f5d36d9
Parents: 27144fc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 20 22:54:27 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 20 22:54:27 2014 +0100
----------------------------------------------------------------------
component/objectstore/jdo/jdo-datanucleus/pom.xml | 10 ++++++++++
.../src/main/java/META-INF/MANIFEST.MF | 6 ------
.../datanucleus/valuetypes/IsisBlobMapping.java | 2 +-
.../src/main/resources/META-INF/MANIFEST.MF | 6 ++++++
.../dom/src/main/java/dom/todo/ToDoItem.java | 17 ++++++-----------
5 files changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/add5fff7/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index a073ab8..6d35cc6 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -55,6 +55,16 @@
</resource>
</resources>
<plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/add5fff7/component/objectstore/jdo/jdo-datanucleus/src/main/java/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/META-INF/MANIFEST.MF b/component/objectstore/jdo/jdo-datanucleus/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index 92bc478..0000000
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Isis JDO ObjectStore DataNucleus Implementation
-Bundle-SymbolicName: org.apache.isis.objectstore.jdo.datanucleus
-Bundle-Version: 1.0.0
-Bundle-Vendor: Apache Isis
http://git-wip-us.apache.org/repos/asf/isis/blob/add5fff7/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
index c5866b6..8776d9e 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
@@ -58,7 +58,7 @@ public class IsisBlobMapping extends SingleFieldMultiMapping {
{
addColumns(ClassNameConstants.JAVA_LANG_STRING); // name
addColumns(ClassNameConstants.JAVA_LANG_STRING); // mime type
- addColumns(ClassNameConstants.JAVA_LANG_BYTE_ARRAY); // bytes
+ addColumns(ClassNameConstants.JAVA_IO_SERIALIZABLE); // bytes
}
public Object getValueForDatastoreMapping(NucleusContext nucleusCtx, int index, Object value)
http://git-wip-us.apache.org/repos/asf/isis/blob/add5fff7/component/objectstore/jdo/jdo-datanucleus/src/main/resources/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/resources/META-INF/MANIFEST.MF b/component/objectstore/jdo/jdo-datanucleus/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..92bc478
--- /dev/null
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Isis JDO ObjectStore DataNucleus Implementation
+Bundle-SymbolicName: org.apache.isis.objectstore.jdo.datanucleus
+Bundle-Version: 1.0.0
+Bundle-Vendor: Apache Isis
http://git-wip-us.apache.org/repos/asf/isis/blob/add5fff7/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index e82fd63..74478b9 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -22,18 +22,13 @@ import java.math.BigDecimal;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
-
import javax.jdo.JDOHelper;
import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.NullValue;
import javax.jdo.annotations.VersionStrategy;
-
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.collect.Ordering;
-
import org.joda.time.LocalDate;
-
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.NonRecoverableException;
@@ -48,12 +43,9 @@ import org.apache.isis.applib.services.background.BackgroundService;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.eventbus.ActionInvokedEvent;
-import org.apache.isis.applib.services.eventbus.CollectionAddedToEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.applib.services.eventbus.PropertyChangedEvent;
import org.apache.isis.applib.services.scratchpad.Scratchpad;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.applib.value.Blob;
@@ -434,9 +426,12 @@ public class ToDoItem implements Comparable<ToDoItem> {
// //////////////////////////////////////
private Blob attachment;
-
- @javax.jdo.annotations.Persistent(defaultFetchGroup="false")
- @javax.jdo.annotations.Column(allowsNull="true")
+ @javax.jdo.annotations.Persistent(defaultFetchGroup="false", columns = {
+ @javax.jdo.annotations.Column(name = "attachment_name"),
+ @javax.jdo.annotations.Column(name = "attachment_mimetype"),
+ @javax.jdo.annotations.Column(name = "attachment_bytes", sqlType = "BLOB")
+ })
+ @Optional
public Blob getAttachment() {
return attachment;
}
[2/2] git commit: ISIS-776: fixing incompatibility between
Reflections usage and the mvn antrun:run / jettyconsole war
Posted by da...@apache.org.
ISIS-776: fixing incompatibility between Reflections usage and the mvn antrun:run / jettyconsole war
- Reflections does not expect to be given a .war file as a URL on the classpath, so instead rename to .jar.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b8d4afcf
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b8d4afcf
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b8d4afcf
Branch: refs/heads/master
Commit: b8d4afcf93a0a6880be64ba0d1d12ff69b456727
Parents: add5fff
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 20 22:55:42 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 20 22:55:42 2014 +0100
----------------------------------------------------------------------
example/application/quickstart_wicket_restful_jdo/webapp/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b8d4afcf/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
index 1381579..9a3fc62 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
@@ -54,6 +54,7 @@
</goals>
<configuration>
<backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage>
+ <destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile>
</configuration>
<phase>package</phase>
</execution>
@@ -286,7 +287,7 @@
<tasks>
<exec executable="java" failonerror="true">
<arg value="-jar" />
- <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.war" />
+ <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
</exec>
</tasks>
</configuration>