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/12/05 18:34:55 UTC
[1/4] isis git commit: ISIS-959 Define explicit dependency on
jackson-annotations because otherwise an old version of it may be picked
Repository: isis
Updated Branches:
refs/heads/master 992ec9002 -> 8a581a826
ISIS-959 Define explicit dependency on jackson-annotations because otherwise an old version of it may be picked
Kitchensink app used jackson-annotations:2.0.5 due to transitive dependency via wickedcharts.
Additionally update Jackson to 2.4.4
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7af85652
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7af85652
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7af85652
Branch: refs/heads/master
Commit: 7af85652c023a3e30cd50ba7dd1b6b25d6df9e3b
Parents: 8aaa166
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Dec 4 12:05:08 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Dec 4 13:09:31 2014 +0100
----------------------------------------------------------------------
core/pom.xml | 7 ++++++-
core/viewer-restfulobjects-applib/pom.xml | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7af85652/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2b1bd32..bc1a720 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -112,7 +112,7 @@
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-codec.version>1.9</commons-codec.version>
- <jackson.version>2.4.3</jackson.version>
+ <jackson.version>2.4.4</jackson.version>
<gson.version>2.2.4</gson.version>
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
@@ -1292,6 +1292,11 @@ ${license.additional-notes}
<version>${jackson.version}</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
http://git-wip-us.apache.org/repos/asf/isis/blob/7af85652/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index c223748..5d1198c 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -91,6 +91,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
</dependencies>
[2/4] isis git commit: ISIS-537 Use smaller file upload and buttons
for Lobs
Posted by da...@apache.org.
ISIS-537 Use smaller file upload and buttons for Lobs
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/40c12d93
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/40c12d93
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/40c12d93
Branch: refs/heads/master
Commit: 40c12d934911daa92729398e43abcf94f5e082af
Parents: 7af8565
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Dec 4 13:41:09 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Dec 4 13:41:09 2014 +0100
----------------------------------------------------------------------
.../components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/40c12d93/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 617f24d..e445741 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -216,7 +216,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
}
});
- fileUploadField.getConfig().showUpload(false);
+ fileUploadField.getConfig().showUpload(false).mainClass("input-group-sm");
return fileUploadField;
}
[4/4] isis git commit: ISIS-955: IsisMoneyMapping for JDO Objectstore.
Posted by da...@apache.org.
ISIS-955: IsisMoneyMapping for JDO Objectstore.
Based on an initial implementation by "ARI", at https://github.com/h2000/isis-jdo-value-mapping.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8a581a82
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8a581a82
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8a581a82
Branch: refs/heads/master
Commit: 8a581a826839f307caf19f598050d47502606ae4
Parents: dccc84d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Dec 5 16:45:51 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Dec 5 17:34:36 2014 +0000
----------------------------------------------------------------------
.../valuetypes/IsisMoneyMapping.java | 131 +++++++++++++++++++
core/runtime/src/main/resources/plugin.xml | 3 +
2 files changed, 134 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8a581a82/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisMoneyMapping.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
new file mode 100644
index 0000000..76aaa55
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.ClassNameConstants;
+import org.datanucleus.ExecutionContext;
+import org.datanucleus.NucleusContext;
+import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.store.rdbms.RDBMSStoreManager;
+import org.datanucleus.store.rdbms.mapping.MappingManager;
+import org.datanucleus.store.rdbms.mapping.java.SingleFieldMultiMapping;
+import org.datanucleus.store.rdbms.table.Column;
+import org.datanucleus.store.rdbms.table.Table;
+import org.apache.isis.applib.value.Money;
+
+public class IsisMoneyMapping extends SingleFieldMultiMapping {
+
+ public IsisMoneyMapping() {
+
+ }
+
+ @Override
+ public Class<?> getJavaType() {
+
+ return org.apache.isis.applib.value.Money.class;
+ }
+
+ @Override
+ public void initialize(final AbstractMemberMetaData mmd, final Table container, final ClassLoaderResolver clr) {
+
+ super.initialize(mmd, container, clr);
+ addColumns();
+ }
+
+ @Override
+ public void initialize(final RDBMSStoreManager storeMgr, final String type) {
+
+ super.initialize(storeMgr, type);
+
+ addColumns();
+ }
+
+ private void addColumns() {
+
+ // amount
+ addColumns(ClassNameConstants.JAVA_LANG_LONG);
+
+ // currency
+ addColumnWithLength(ClassNameConstants.JAVA_LANG_STRING, 3);
+ }
+
+ public void addColumnWithLength(final String typeName, final int columnLength) {
+
+ final MappingManager mgr = getStoreManager().getMappingManager();
+ Column column = null;
+ if (table != null) {
+ column = mgr.createColumn(this, typeName, getNumberOfDatastoreMappings());
+ /* TODO metaData.setJdbcType("NCHAR") */
+ column.setColumnMetaData(column.getColumnMetaData().setLength(columnLength));
+ }
+ mgr.createDatastoreMapping(this, column, typeName);
+ }
+
+ @Override
+ public Object getValueForDatastoreMapping(final NucleusContext nucleusCtx, final int index, final Object value) {
+
+ final Money m = ((Money) value);
+ switch (index) {
+ case 0:
+ return m.longValue();
+ case 1:
+ return m.getCurrency();
+ }
+ throw new IndexOutOfBoundsException();
+ }
+
+ @Override
+ public void setObject(final ExecutionContext ec, final PreparedStatement preparedStmt, final int[] exprIndex,
+ final Object value) {
+
+ final Money m = ((Money) value);
+ if (m == null) {
+ getDatastoreMapping(0).setLong(preparedStmt, exprIndex[0], 0l);
+ getDatastoreMapping(1).setString(preparedStmt, exprIndex[1], null);
+ } else {
+ getDatastoreMapping(0).setLong(preparedStmt, exprIndex[0], m.longValue());
+ getDatastoreMapping(1).setString(preparedStmt, exprIndex[1], m.getCurrency());
+ }
+ }
+
+ @Override
+ public Object getObject(final ExecutionContext ec, final ResultSet resultSet, final int[] exprIndex) {
+
+ try {
+ // Check for null entries
+ if (getDatastoreMapping(0).getObject(resultSet, exprIndex[0]) == null
+ || getDatastoreMapping(1).getObject(resultSet, exprIndex[1]) == null) {
+ return null;
+ }
+ } catch (final Exception e) {
+ // Do nothing
+ }
+
+ final long amount = getDatastoreMapping(0).getLong(resultSet, exprIndex[0]);
+ final String currency = getDatastoreMapping(1).getString(resultSet, exprIndex[1]);
+ if (currency == null) {
+ return null;
+ }
+ return new Money(((Long) amount).doubleValue() / 100, currency);
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8a581a82/core/runtime/src/main/resources/plugin.xml
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/resources/plugin.xml b/core/runtime/src/main/resources/plugin.xml
index 863b71f..22b1da4 100644
--- a/core/runtime/src/main/resources/plugin.xml
+++ b/core/runtime/src/main/resources/plugin.xml
@@ -37,6 +37,9 @@
<mapping
java-type="org.apache.isis.applib.value.Clob"
mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisClobMapping"/>
+ <mapping
+ java-type="org.apache.isis.applib.value.Money"
+ mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisMoneyMapping"/>
</extension>
[3/4] isis git commit: Merge remote-tracking branch
'martin-g/isis-537-smaller-file-input-fields'
Posted by da...@apache.org.
Merge remote-tracking branch 'martin-g/isis-537-smaller-file-input-fields'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dccc84dd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dccc84dd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dccc84dd
Branch: refs/heads/master
Commit: dccc84dd083ef238a021fa7ba0e6eca0998f94cb
Parents: 992ec90 40c12d9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Dec 5 15:25:29 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Dec 5 15:25:29 2014 +0000
----------------------------------------------------------------------
.../scalars/isisapplib/IsisBlobOrClobPanelAbstract.java | 2 +-
core/pom.xml | 7 ++++++-
core/viewer-restfulobjects-applib/pom.xml | 4 ++++
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------