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/03/18 08:20:03 UTC
[1/5] git commit: ISIS-695: updating example apps to use snapshot
versions
Repository: isis
Updated Branches:
refs/heads/master e9bb5422c -> 472811c59
ISIS-695: updating example apps to use snapshot versions
... rather than released versions (so can test new stuff etc).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f3f81fec
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f3f81fec
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f3f81fec
Branch: refs/heads/master
Commit: f3f81fecdfa6fdebad4ae9e9df9ef7450061379d
Parents: e9bb542
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Mar 18 07:03:23 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Mar 18 07:03:23 2014 +0000
----------------------------------------------------------------------
example/application/quickstart_wicket_restful_jdo/pom.xml | 8 ++++----
example/application/simple_wicket_restful_jdo/pom.xml | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f3f81fec/example/application/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml
index efa383e..8780084 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -34,11 +34,11 @@
</prerequisites>
<properties>
- <isis.version>1.4.0</isis.version>
- <isis-objectstore-jdo.version>1.4.1</isis-objectstore-jdo.version>
- <isis-viewer-wicket.version>1.4.1</isis-viewer-wicket.version>
+ <isis.version>1.4.2-SNAPSHOT</isis.version>
+ <isis-objectstore-jdo.version>1.4.2-SNAPSHOT</isis-objectstore-jdo.version>
+ <isis-viewer-wicket.version>1.4.2-SNAPSHOT</isis-viewer-wicket.version>
<isis-viewer-restfulobjects.version>2.2.0</isis-viewer-restfulobjects.version>
- <isis-security-shiro.version>1.4.0</isis-security-shiro.version>
+ <isis-security-shiro.version>1.4.2-SNAPSHOT</isis-security-shiro.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/f3f81fec/example/application/simple_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/pom.xml b/example/application/simple_wicket_restful_jdo/pom.xml
index 403b8ad..2f8cedc 100644
--- a/example/application/simple_wicket_restful_jdo/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/pom.xml
@@ -34,11 +34,11 @@
</prerequisites>
<properties>
- <isis.version>1.4.0</isis.version>
- <isis-objectstore-jdo.version>1.4.1</isis-objectstore-jdo.version>
- <isis-viewer-wicket.version>1.4.1</isis-viewer-wicket.version>
+ <isis.version>1.4.2-SNAPSHOT</isis.version>
+ <isis-objectstore-jdo.version>1.4.2-SNAPSHOT</isis-objectstore-jdo.version>
+ <isis-viewer-wicket.version>1.4.2-SNAPSHOT</isis-viewer-wicket.version>
<isis-viewer-restfulobjects.version>2.2.0</isis-viewer-restfulobjects.version>
- <isis-security-shiro.version>1.4.0</isis-security-shiro.version>
+ <isis-security-shiro.version>1.4.2-SNAPSHOT</isis-security-shiro.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
[4/5] git commit: ISIS-750: store serializedForm of event as clob.
Posted by da...@apache.org.
ISIS-750: store serializedForm of event as clob.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/603ca0f1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/603ca0f1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/603ca0f1
Branch: refs/heads/master
Commit: 603ca0f14e7a98eed746c54b465caaceaee5db3e
Parents: 86230f4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Mar 18 06:59:36 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Mar 18 07:07:27 2014 +0000
----------------------------------------------------------------------
.../service/publish/PublishedEventJdo.java | 32 ++++++++++++----
.../service/publish/PublishingServiceJdo.java | 40 ++++++++++++++++++--
.../WEB-INF/persistor_datanucleus.properties | 4 ++
.../WEB-INF/persistor_datanucleus.properties | 3 ++
4 files changed, 68 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/603ca0f1/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEventJdo.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEventJdo.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEventJdo.java
index 6e9c73a..e74c241 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEventJdo.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEventJdo.java
@@ -412,30 +412,46 @@ public class PublishedEventJdo extends DomainChangeJdoAbstract implements HasTra
@Hidden(where=Where.ALL_TABLES)
@MemberOrder(name="Detail", sequence = "40")
public String getSerializedForm() {
- return IoUtils.fromUtf8ZippedBytes("serializedForm", getSerializedFormZipped());
+ byte[] zipped = getSerializedFormZipped();
+ if(zipped != null) {
+ return PublishingServiceJdo.fromZippedBytes(zipped);
+ } else {
+ return getSerializedFormClob();
+ }
}
- public void setSerializedForm(final String serializedForm) {
- final byte[] zippedBytes = IoUtils.toUtf8ZippedBytes("serializedForm", serializedForm);
- setSerializedFormZipped(zippedBytes);
- }
// //////////////////////////////////////
-
- @javax.jdo.annotations.Column
+ @Deprecated
+ @javax.jdo.annotations.Column(allowsNull="true")
private byte[] serializedFormZipped;
+ @Deprecated
@Programmatic // ignored by Isis
public byte[] getSerializedFormZipped() {
return serializedFormZipped;
}
+ @Deprecated
public void setSerializedFormZipped(final byte[] serializedFormZipped) {
this.serializedFormZipped = serializedFormZipped;
}
-
+ // //////////////////////////////////////
+
+ private String serializedFormClob;
+
+ @Programmatic // ignored by Isis
+ @javax.jdo.annotations.Column(allowsNull="true", jdbcType="CLOB")
+ public String getSerializedFormClob() {
+ return serializedFormClob;
+ }
+
+ public void setSerializedFormClob(final String serializedFormClob) {
+ this.serializedFormClob = serializedFormClob;
+ }
+
// //////////////////////////////////////
// processed (action)
http://git-wip-us.apache.org/repos/asf/isis/blob/603ca0f1/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishingServiceJdo.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishingServiceJdo.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishingServiceJdo.java
index 64f2d79..fa08038 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishingServiceJdo.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishingServiceJdo.java
@@ -23,6 +23,8 @@ import java.util.Map;
import javax.annotation.PostConstruct;
+import com.google.common.base.Strings;
+
import org.apache.isis.applib.AbstractService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
@@ -38,12 +40,27 @@ import org.apache.isis.applib.services.publish.PublishingService;
*/
public class PublishingServiceJdo extends AbstractService implements PublishingService {
+ private static final String SERIALIZED_FORM_LOCAL_KEY = "datanucleus.PublishingService.serializedForm";
+ private final static String SERIALIZED_FORM_KEY = "isis.persistor." + SERIALIZED_FORM_LOCAL_KEY;
+
+ static enum SerializedForm {
+ CLOB,
+ @Deprecated
+ ZIPPED;
+ static SerializedForm parse(final String value) {
+ return CLOB.toString().equalsIgnoreCase(value)? CLOB: ZIPPED;
+ }
+ }
+ private SerializedForm serializedForm;
+
@Programmatic
@PostConstruct
- public void init(Map<String,String> props) {
+ public void init(Map<String,String> configuration) {
ensureDependenciesInjected();
+ serializedForm = SerializedForm.parse(configuration.get(SERIALIZED_FORM_KEY));
}
+
// //////////////////////////////////////
@@ -62,7 +79,14 @@ public class PublishingServiceJdo extends AbstractService implements PublishingS
public void publish(final EventMetadata metadata, final EventPayload payload) {
final String serializedEvent = eventSerializer.serialize(metadata, payload).toString();
final PublishedEventJdo publishedEvent = newTransientInstance(PublishedEventJdo.class);
- publishedEvent.setSerializedForm(serializedEvent);
+
+ if(this.serializedForm == SerializedForm.ZIPPED) {
+ final byte[] zippedBytes = asZippedBytes(serializedEvent);
+ publishedEvent.setSerializedFormZipped(zippedBytes);
+ } else {
+ publishedEvent.setSerializedFormClob(serializedEvent);
+ }
+
publishedEvent.setTransactionId(metadata.getTransactionId());
publishedEvent.setSequence(metadata.getSequence());
publishedEvent.setEventType(metadata.getEventType());
@@ -78,6 +102,12 @@ public class PublishingServiceJdo extends AbstractService implements PublishingS
persist(publishedEvent);
}
+
+ static byte[] asZippedBytes(final String serializedEvent) {
+ return IoUtils.toUtf8ZippedBytes("serializedForm", serializedEvent);
+ }
+
+
// //////////////////////////////////////
private EventSerializer eventSerializer;
@@ -87,7 +117,11 @@ public class PublishingServiceJdo extends AbstractService implements PublishingS
this.eventSerializer = eventSerializer;
}
-
+ static String fromZippedBytes(byte[] zipped) {
+ return IoUtils.fromUtf8ZippedBytes("serializedForm", zipped);
+ }
+
+
@javax.inject.Inject
private CommandContext commandContext;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/603ca0f1/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
index 394c0aa..46b50ee 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
@@ -23,6 +23,10 @@
# if move class to other package (eg com.mycompany.myapp.dom) then update
isis.persistor.datanucleus.RegisterEntities.packagePrefix=dom
+# whether to persist the event data as a "clob" or as a "zipped" byte[]
+# default is "zipped"
+#isis.persistor.datanucleus.PublishingService.serializedForm=zipped
+
#####################################################################
http://git-wip-us.apache.org/repos/asf/isis/blob/603ca0f1/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
index 394c0aa..391bb41 100644
--- a/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ b/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
@@ -23,6 +23,9 @@
# if move class to other package (eg com.mycompany.myapp.dom) then update
isis.persistor.datanucleus.RegisterEntities.packagePrefix=dom
+# whether to persist the event data as a "clob" or as a "zipped" byte[]
+# default is "zipped"
+#isis.persistor.datanucleus.PublishingService.serializedForm=zipped
#####################################################################
[3/5] git commit: ISIS-744: convert CommandJdo to use clob ...
Posted by da...@apache.org.
ISIS-744: convert CommandJdo to use clob ...
... for exception property.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/86230f40
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/86230f40
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/86230f40
Branch: refs/heads/master
Commit: 86230f404d08bbf44cc73d21542153cddd4df925
Parents: e47bf95
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 17 12:15:20 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Mar 18 07:07:22 2014 +0000
----------------------------------------------------------------------
.../isis/objectstore/jdo/applib/service/JdoColumnLength.java | 1 -
.../isis/objectstore/jdo/applib/service/command/CommandJdo.java | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/86230f40/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
index ef6ca00..55917e0 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
@@ -45,7 +45,6 @@ public final class JdoColumnLength {
private Command() {
}
public final static int ARGUMENTS = 1024;
- public final static int EXCEPTION = 16000;
public static final int EXECUTE_IN = 10;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/86230f40/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/command/CommandJdo.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/command/CommandJdo.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/command/CommandJdo.java
index 0200d22..8e47e0c 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/command/CommandJdo.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/command/CommandJdo.java
@@ -605,7 +605,7 @@ public class CommandJdo extends DomainChangeJdoAbstract implements Command {
* Not part of the applib API, because the default implementation is not persistent
* and so there's no object that can be accessed to be annotated.
*/
- @javax.jdo.annotations.Column(allowsNull="true", length=JdoColumnLength.Command.EXCEPTION)
+ @javax.jdo.annotations.Column(allowsNull="true", jdbcType="CLOB")
@Hidden
@Override
public String getException() {
@@ -614,7 +614,7 @@ public class CommandJdo extends DomainChangeJdoAbstract implements Command {
@Override
public void setException(final String exception) {
- this.exception = Util.abbreviated(exception, JdoColumnLength.Command.EXCEPTION);
+ this.exception = exception;
}
[5/5] git commit: ISIS-745: don't exclude org.apache.isis from
downloaded metamodel
Posted by da...@apache.org.
ISIS-745: don't exclude org.apache.isis from downloaded metamodel
... because in particular, we want to see any JDO objectstore entities that are in the metamodel.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/472811c5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/472811c5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/472811c5
Branch: refs/heads/master
Commit: 472811c59411115cc93bc2e40138de675dce08b7
Parents: 603ca0f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 17 12:18:51 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Mar 18 07:07:31 2014 +0000
----------------------------------------------------------------------
.../services/devutils/DeveloperUtilitiesServiceDefault.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/472811c5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java
index e88217c..3c5af53 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/DeveloperUtilitiesServiceDefault.java
@@ -137,7 +137,7 @@ public class DeveloperUtilitiesServiceDefault implements DeveloperUtilitiesServi
protected boolean isBuiltIn(ObjectSpecification spec) {
final String className = spec.getFullIdentifier();
- return className.startsWith("java") || className.startsWith("org.joda") || className.startsWith("org.apache.isis");
+ return className.startsWith("java") || className.startsWith("org.joda");
}
// //////////////////////////////////////
[2/5] git commit: ISIS-751: updating dates in NOTICE files.
Posted by da...@apache.org.
ISIS-751: updating dates in NOTICE files.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e47bf951
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e47bf951
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e47bf951
Branch: refs/heads/master
Commit: e47bf9511251abdd2903591167988de31dd060ea
Parents: f3f81fe
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Mar 18 07:04:15 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Mar 18 07:04:15 2014 +0000
----------------------------------------------------------------------
component/objectstore/jdo/NOTICE | 2 +-
component/security/file/NOTICE | 2 +-
component/security/shiro/NOTICE | 2 +-
component/viewer/restfulobjects/NOTICE | 2 +-
component/viewer/wicket/NOTICE | 2 +-
core/NOTICE | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e47bf951/component/objectstore/jdo/NOTICE
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/NOTICE b/component/objectstore/jdo/NOTICE
index ba21d0c..a93e145 100644
--- a/component/objectstore/jdo/NOTICE
+++ b/component/objectstore/jdo/NOTICE
@@ -1,5 +1,5 @@
Apache Isis
-Copyright 2010-2013 The Apache Software Foundation
+Copyright 2010-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/isis/blob/e47bf951/component/security/file/NOTICE
----------------------------------------------------------------------
diff --git a/component/security/file/NOTICE b/component/security/file/NOTICE
index ba21d0c..a93e145 100644
--- a/component/security/file/NOTICE
+++ b/component/security/file/NOTICE
@@ -1,5 +1,5 @@
Apache Isis
-Copyright 2010-2013 The Apache Software Foundation
+Copyright 2010-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/isis/blob/e47bf951/component/security/shiro/NOTICE
----------------------------------------------------------------------
diff --git a/component/security/shiro/NOTICE b/component/security/shiro/NOTICE
index ba21d0c..a93e145 100644
--- a/component/security/shiro/NOTICE
+++ b/component/security/shiro/NOTICE
@@ -1,5 +1,5 @@
Apache Isis
-Copyright 2010-2013 The Apache Software Foundation
+Copyright 2010-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/isis/blob/e47bf951/component/viewer/restfulobjects/NOTICE
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/NOTICE b/component/viewer/restfulobjects/NOTICE
index ba21d0c..a93e145 100644
--- a/component/viewer/restfulobjects/NOTICE
+++ b/component/viewer/restfulobjects/NOTICE
@@ -1,5 +1,5 @@
Apache Isis
-Copyright 2010-2013 The Apache Software Foundation
+Copyright 2010-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/isis/blob/e47bf951/component/viewer/wicket/NOTICE
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/NOTICE b/component/viewer/wicket/NOTICE
index ba21d0c..a93e145 100644
--- a/component/viewer/wicket/NOTICE
+++ b/component/viewer/wicket/NOTICE
@@ -1,5 +1,5 @@
Apache Isis
-Copyright 2010-2013 The Apache Software Foundation
+Copyright 2010-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/isis/blob/e47bf951/core/NOTICE
----------------------------------------------------------------------
diff --git a/core/NOTICE b/core/NOTICE
index ba21d0c..a93e145 100644
--- a/core/NOTICE
+++ b/core/NOTICE
@@ -1,5 +1,5 @@
Apache Isis
-Copyright 2010-2013 The Apache Software Foundation
+Copyright 2010-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).