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 2011/01/08 23:54:01 UTC
svn commit: r1056832 [4/17] - in /incubator/isis/trunk:
alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/
alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/
alternati...
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectRequestEncodabilityTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectRequestEncodabilityTest.java Sat Jan 8 22:53:36 2011
@@ -27,9 +27,9 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
import org.apache.isis.alternatives.remoting.common.exchange.GetObjectRequest;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesRequestEncodabilityTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesRequestEncodabilityTest.java Sat Jan 8 22:53:36 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
import org.apache.isis.alternatives.remoting.common.exchange.GetPropertiesRequest;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesRequestEncodabilityTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesRequestEncodabilityTest.java Sat Jan 8 22:53:36 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
import org.apache.isis.alternatives.remoting.common.exchange.HasInstancesRequest;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceRequestEncodabilityTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceRequestEncodabilityTest.java Sat Jan 8 22:53:36 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
import org.apache.isis.alternatives.remoting.common.exchange.OidForServiceRequest;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldRequestEncodabilityTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldRequestEncodabilityTest.java Sat Jan 8 22:53:36 2011
@@ -28,8 +28,8 @@ import java.io.IOException;
import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
import org.apache.isis.alternatives.remoting.common.exchange.ResolveFieldRequest;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveObjectRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveObjectRequestEncodabilityTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveObjectRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveObjectRequestEncodabilityTest.java Sat Jan 8 22:53:36 2011
@@ -28,8 +28,8 @@ import java.io.IOException;
import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
import org.apache.isis.alternatives.remoting.common.exchange.ResolveObjectRequest;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationRequestEncodabilityTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationRequestEncodabilityTest.java Sat Jan 8 22:53:36 2011
@@ -28,8 +28,8 @@ import java.io.IOException;
import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
import org.apache.isis.alternatives.remoting.common.exchange.SetAssociationRequest;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueRequestEncodabilityTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueRequestEncodabilityTest.java Sat Jan 8 22:53:36 2011
@@ -29,8 +29,8 @@ import java.io.IOException;
import org.apache.isis.alternatives.remoting.common.data.common.EncodableObjectData;
import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
import org.apache.isis.alternatives.remoting.common.exchange.SetValueRequest;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/facade/DummyServerFacade.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/facade/DummyServerFacade.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/facade/DummyServerFacade.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/facade/DummyServerFacade.java Sat Jan 8 22:53:36 2011
@@ -56,7 +56,7 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.exchange.SetValueRequest;
import org.apache.isis.alternatives.remoting.common.exchange.SetValueResponse;
import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
/**
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_AssociationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_AssociationTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_AssociationTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_AssociationTest.java Sat Jan 8 22:53:36 2011
@@ -41,10 +41,10 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.exchange.SetAssociationResponse;
import org.apache.isis.alternatives.remoting.common.facade.impl.ServerFacadeImpl;
import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ClientActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ClientActionTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ClientActionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ClientActionTest.java Sat Jan 8 22:53:36 2011
@@ -34,10 +34,10 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.exchange.KnownObjectsRequest;
import org.apache.isis.alternatives.remoting.common.facade.impl.ServerFacadeImpl;
import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.persistence.ConcurrencyException;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java Sat Jan 8 22:53:36 2011
@@ -43,9 +43,9 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
import org.apache.isis.alternatives.remoting.common.facade.impl.ServerFacadeImpl;
import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
Modified: incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java Sat Jan 8 22:53:36 2011
@@ -28,15 +28,15 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.marshalling.MarshallerAbstract;
import org.apache.isis.alternatives.remoting.common.marshalling.MarshallingConstants;
import org.apache.isis.alternatives.remoting.transport.Transport;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataInputStreamExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.core.commons.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.commons.encoding.DebugDataInputExtended;
+import org.apache.isis.core.commons.encoding.DebugDataOutputExtended;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
-import org.apache.isis.core.metamodel.encoding.DebugDataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DebugDataOutputExtended;
-import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.log4j.Logger;
public class EncodingMarshaller extends MarshallerAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java Sat Jan 8 22:53:36 2011
@@ -30,8 +30,8 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.protocol.IllegalRequestException;
import org.apache.isis.alternatives.remoting.transport.ConnectionException;
import org.apache.isis.alternatives.remoting.transport.Transport;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.log4j.Logger;
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java Sat Jan 8 22:53:36 2011
@@ -30,8 +30,8 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.protocol.IllegalRequestException;
import org.apache.isis.alternatives.remoting.transport.ConnectionException;
import org.apache.isis.alternatives.remoting.transport.Transport;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.log4j.Logger;
import com.thoughtworks.xstream.XStream;
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java Sat Jan 8 22:53:36 2011
@@ -29,8 +29,8 @@ import org.apache.commons.httpclient.Htt
import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.isis.alternatives.remoting.transport.TransportAbstract;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.io.LazyInputStream;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
public class HttpClientTransport extends TransportAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.remoting.transport.http.client;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
public class HttpRemotingConstants {
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java Sat Jan 8 22:53:36 2011
@@ -35,7 +35,7 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.server.ServerConnectionDefault;
import org.apache.isis.alternatives.remoting.transport.ServerConnectionHandler;
import org.apache.isis.alternatives.remoting.transport.simple.SimpleTransport;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.webapp.IsisWebAppBootstrapper;
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java Sat Jan 8 22:53:36 2011
@@ -38,7 +38,7 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransportConstants;
import org.apache.isis.alternatives.remoting.transport.sockets.shared.Worker;
import org.apache.isis.alternatives.remoting.transport.sockets.shared.WorkerPool;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.Threads;
@@ -49,7 +49,7 @@ import org.apache.isis.core.runtime.view
import org.apache.log4j.Logger;
-public abstract class SocketsViewerAbstract extends IsisViewerAbstract implements DebugInfo {
+public abstract class SocketsViewerAbstract extends IsisViewerAbstract implements DebuggableWithTitle {
private static final Logger LOG = Logger.getLogger(SocketsViewerAbstract.class);
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java Sat Jan 8 22:53:36 2011
@@ -21,7 +21,7 @@
package org.apache.isis.alternatives.remoting.transport.sockets.server;
import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransportConstants;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java Sat Jan 8 22:53:36 2011
@@ -34,7 +34,8 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.transport.ProfilingInputStream;
import org.apache.isis.alternatives.remoting.transport.ProfilingOutputStream;
import org.apache.isis.alternatives.remoting.transport.TransportAbstract;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+
import org.apache.log4j.Logger;
public class SocketTransport extends TransportAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java Sat Jan 8 22:53:36 2011
@@ -21,7 +21,7 @@
package org.apache.isis.alternatives.remoting.transport.sockets.shared;
import org.apache.isis.alternatives.remoting.transport.TransportInstaller;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
public final class SocketTransportConstants {
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authentication/FileAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authentication/FileAuthenticationManagerInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authentication/FileAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authentication/FileAuthenticationManagerInstaller.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.security.file.authentication;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
import org.apache.isis.core.runtime.authentication.standard.Authenticator;
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authentication/FileAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authentication/FileAuthenticator.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authentication/FileAuthenticator.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authentication/FileAuthenticator.java Sat Jan 8 22:53:36 2011
@@ -27,11 +27,11 @@ import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.StringTokenizer;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.io.IoUtils;
+import org.apache.isis.core.commons.lang.IoUtils;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.runtime.authentication.standard.PasswordRequestAuthenticatorAbstract;
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizationConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizationConstants.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizationConstants.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.security.file.authorization;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.authorization.standard.AuthorizationConstants;
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizationManagerInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizationManagerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizationManagerInstaller.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.security.file.authorization;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
import org.apache.isis.core.runtime.authorization.standard.Authorizor;
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java Sat Jan 8 22:53:36 2011
@@ -39,10 +39,10 @@ import java.util.StringTokenizer;
import org.apache.log4j.Logger;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetedmethod.IdentifierUtils;
import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticationConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticationConstants.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticationConstants.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.security.ldap.authentication;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
public final class LdapAuthenticationConstants {
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticationManagerInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticationManagerInstaller.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.security.ldap.authentication;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
import org.apache.isis.core.runtime.authentication.standard.Authenticator;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticator.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticator.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticator.java Sat Jan 8 22:53:36 2011
@@ -34,9 +34,10 @@ import javax.naming.directory.SearchCont
import javax.naming.directory.SearchResult;
import org.apache.log4j.Logger;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizationConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizationConstants.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizationConstants.java Sat Jan 8 22:53:36 2011
@@ -21,7 +21,7 @@
package org.apache.isis.alternatives.security.ldap.authorization;
import org.apache.isis.alternatives.security.ldap.authentication.LdapAuthenticationConstants;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.authorization.standard.AuthorizationConstants;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizationManagerInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizationManagerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizationManagerInstaller.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.security.ldap.authorization;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
import org.apache.isis.core.runtime.authorization.standard.Authorizor;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizor.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizor.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/alternatives/security/ldap/authorization/LdapAuthorizor.java Sat Jan 8 22:53:36 2011
@@ -39,8 +39,8 @@ import javax.naming.directory.SearchResu
import org.apache.log4j.Logger;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
Added: incubator/isis/trunk/applib/applib.java.hsp
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/applib.java.hsp?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/applib/applib.java.hsp (added)
+++ incubator/isis/trunk/applib/applib.java.hsp Sat Jan 8 22:53:36 2011
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<local-project language="java" version="3.3.722" flavor="j2se">
+ <property name="hide-externals" value="true" />
+ <property name="show-needs-to-compile" value="false" />
+ <property name="detail-mode" value="false" />
+ <classpath>
+ <classpathentry kind="lib" path="D:\SVN\ai\isis\trunk\applib\target\classes" />
+ </classpath>
+ <sourcepaths>
+ <pathentry type="file" path="src/main/java" />
+ </sourcepaths>
+ <grid-set sep="." version="3.3.722">
+ <grid name="Diagram 2" enforce="true" strict="false">
+ <row>
+ <cell name="fixtures" pattern="org.apache.isis.applib.fixtures.*" vexpanded="true" visibility="public" />
+ <cell name="value" pattern="org.apache.isis.applib.value.?" vexpanded="true" visibility="public" />
+ <cell name="events" pattern="org.apache.isis.applib.events.?" vexpanded="true" visibility="public" />
+ </row>
+ <row>
+ <cell name="profiles" pattern="org.apache.isis.applib.profiles.?" vexpanded="true" visibility="public" />
+ <cell name="clock" pattern="org.apache.isis.applib.clock.?" vexpanded="true" visibility="public" />
+ <cell name="adapters" pattern="org.apache.isis.applib.adapters.?" vexpanded="true" visibility="public" />
+ </row>
+ <row>
+ <cell name="applib" pattern="org.apache.isis.applib.?" vexpanded="true" visibility="public" />
+ </row>
+ <row>
+ <cell name="query" pattern="org.apache.isis.applib.query.?" vexpanded="true" visibility="public" />
+ <cell name="filter" pattern="org.apache.isis.applib.filter.?" vexpanded="true" visibility="public" />
+ <cell name="security" pattern="org.apache.isis.applib.security.?" vexpanded="true" visibility="public" />
+ </row>
+ <row>
+ <cell name="marker" pattern="org.apache.isis.applib.marker.?" vexpanded="true" visibility="public" />
+ <cell name="annotation" pattern="org.apache.isis.applib.annotation.?" vexpanded="false" visibility="public">
+ <grid>
+ <row>
+ <cell name="DescribedAs" pattern="org.apache.isis.applib.annotation.DescribedAs" vexpanded="true" visibility="public" />
+ <cell name="Bounded" pattern="org.apache.isis.applib.annotation.Bounded" vexpanded="true" visibility="public" />
+ <cell name="Disabled" pattern="org.apache.isis.applib.annotation.Disabled" vexpanded="true" visibility="public" />
+ <cell name="TypicalLength" pattern="org.apache.isis.applib.annotation.TypicalLength" vexpanded="true" visibility="public" />
+ <cell name="RegEx" pattern="org.apache.isis.applib.annotation.RegEx" vexpanded="true" visibility="public" />
+ <cell name="Facets" pattern="org.apache.isis.applib.annotation.Facets" vexpanded="true" visibility="public" />
+ <cell name="MemberOrder" pattern="org.apache.isis.applib.annotation.MemberOrder" vexpanded="true" visibility="public" />
+ <cell name="NotPersisted" pattern="org.apache.isis.applib.annotation.NotPersisted" vexpanded="true" visibility="public" />
+ <cell name="Mask" pattern="org.apache.isis.applib.annotation.Mask" vexpanded="true" visibility="public" />
+ <cell name="TypeOf" pattern="org.apache.isis.applib.annotation.TypeOf" vexpanded="true" visibility="public" />
+ <cell name="MaxLength" pattern="org.apache.isis.applib.annotation.MaxLength" vexpanded="true" visibility="public" />
+ <cell name="FieldOrder" pattern="org.apache.isis.applib.annotation.FieldOrder" vexpanded="true" visibility="public" />
+ <cell name="Named" pattern="org.apache.isis.applib.annotation.Named" vexpanded="true" visibility="public" />
+ <cell name="MultiLine" pattern="org.apache.isis.applib.annotation.MultiLine" vexpanded="true" visibility="public" />
+ <cell name="ActionOrder" pattern="org.apache.isis.applib.annotation.ActionOrder" vexpanded="true" visibility="public" />
+ <cell name="Value" pattern="org.apache.isis.applib.annotation.Value" vexpanded="true" visibility="public" />
+ <cell name="Parseable" pattern="org.apache.isis.applib.annotation.Parseable" vexpanded="true" visibility="public" />
+ <cell name="NotPersistable" pattern="org.apache.isis.applib.annotation.NotPersistable" vexpanded="true" visibility="public" />
+ <cell name="Debug" pattern="org.apache.isis.applib.annotation.Debug" vexpanded="true" visibility="public" />
+ <cell name="Aggregated" pattern="org.apache.isis.applib.annotation.Aggregated" vexpanded="true" visibility="public" />
+ <cell name="MustSatisfy" pattern="org.apache.isis.applib.annotation.MustSatisfy" vexpanded="true" visibility="public" />
+ <cell name="NotContributed" pattern="org.apache.isis.applib.annotation.NotContributed" vexpanded="true" visibility="public" />
+ <cell name="NotInServiceMenu" pattern="org.apache.isis.applib.annotation.NotInServiceMenu" vexpanded="true" visibility="public" />
+ <cell name="Optional" pattern="org.apache.isis.applib.annotation.Optional" vexpanded="true" visibility="public" />
+ <cell name="EqualByContent" pattern="org.apache.isis.applib.annotation.EqualByContent" vexpanded="true" visibility="public" />
+ <cell name="Executed" pattern="org.apache.isis.applib.annotation.Executed" vexpanded="true" visibility="public" />
+ <cell name="Plural" pattern="org.apache.isis.applib.annotation.Plural" vexpanded="true" visibility="public" />
+ <cell name="Hidden" pattern="org.apache.isis.applib.annotation.Hidden" vexpanded="true" visibility="public" />
+ <cell name="Immutable" pattern="org.apache.isis.applib.annotation.Immutable" vexpanded="true" visibility="public" />
+ <cell name="Encodable" pattern="org.apache.isis.applib.annotation.Encodable" vexpanded="true" visibility="public" />
+ <cell name="Exploration" pattern="org.apache.isis.applib.annotation.Exploration" vexpanded="true" visibility="public" />
+ <cell name="Defaulted" pattern="org.apache.isis.applib.annotation.Defaulted" vexpanded="true" visibility="public" />
+ <cell name="Ignore" pattern="org.apache.isis.applib.annotation.Ignore" vexpanded="true" visibility="public" />
+ <cell name="Prototype" pattern="org.apache.isis.applib.annotation.Prototype" vexpanded="true" visibility="public" />
+ </row>
+ <row>
+ <cell name="When" pattern="org.apache.isis.applib.annotation.When" vexpanded="true" visibility="public" />
+ </row>
+ </grid>
+ </cell>
+ </row>
+ <row>
+ <cell name="spec" pattern="org.apache.isis.applib.spec.?" vexpanded="true" visibility="public" />
+ <cell name="snapshot" pattern="org.apache.isis.applib.snapshot.?" vexpanded="true" visibility="public" />
+ </row>
+ <row>
+ <cell name="util" pattern="org.apache.isis.applib.util.?" vexpanded="true" visibility="public" />
+ </row>
+ </grid>
+ </grid-set>
+</local-project>
+
Added: incubator/isis/trunk/applib/src/docbkx/guide/images/architecture-perspective.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/docbkx/guide/images/architecture-perspective.png?rev=1056832&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/applib/src/docbkx/guide/images/architecture-perspective.png
------------------------------------------------------------------------------
needs-lock =
Propchange: incubator/isis/trunk/applib/src/docbkx/guide/images/architecture-perspective.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/isis/trunk/applib/src/docbkx/guide/images/composition-perspective.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/docbkx/guide/images/composition-perspective.png?rev=1056832&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/applib/src/docbkx/guide/images/composition-perspective.png
------------------------------------------------------------------------------
needs-lock =
Propchange: incubator/isis/trunk/applib/src/docbkx/guide/images/composition-perspective.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml (original)
+++ incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml Sat Jan 8 22:53:36 2011
@@ -3733,10 +3733,11 @@ public class Money extends Magnitude {
</abstract>
<para>Many if not all enterprise applications deal with dates and times
- in one way or another. For example, if an Order is placed, then the
- Customer may have 30 days to pay the Invoice, otherwise a penalty may be
- levied. However, this can complicate automated testing: "today+30" will
- be a different date every time the test is run.</para>
+ in one way or another. For example, if an <classname>Order</classname>
+ is placed, then the <classname>Customer</classname> may have 30 days to
+ pay the Invoice, otherwise a penalty may be levied. However, this can
+ complicate automated testing: "today+30" will be a different date every
+ time the test is run.</para>
<para>A common solution is to require that domain objects do not go
directly to the system for the current date (ie don't simply instantiate
@@ -6556,5 +6557,32 @@ public class ComplexNumber {
</imageobject>
</mediaobject>
</appendix>
+
+ <appendix>
+ <title>Package Dependencies</title>
+
+ <abstract>
+ <para>The dependencies between the packages.</para>
+ </abstract>
+
+ <para>The following diagram shows that the relationship between the
+ different packages that make up the applib (note that there are no
+ cyclic dependencies between the packages):</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/composition-perspective.png" scale="70" />
+ </imageobject>
+ </mediaobject>
+
+ <para>The following diagram shows the same packages, but from a layered,
+ architecture perspective:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/architecture-perspective.png" scale="70" />
+ </imageobject>
+ </mediaobject>
+ </appendix>
</part>
</book>
Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java Sat Jan 8 22:53:36 2011
@@ -22,6 +22,7 @@ package org.apache.isis.applib;
import java.util.List;
import org.apache.isis.applib.annotation.Hidden;
+import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.security.UserMemento;
Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java Sat Jan 8 22:53:36 2011
@@ -21,6 +21,7 @@ package org.apache.isis.applib;
import java.util.List;
+import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.security.UserMemento;
Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java Sat Jan 8 22:53:36 2011
@@ -25,7 +25,6 @@ import java.util.List;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.util.NameUtils;
public class Identifier implements Comparable<Identifier> {
@@ -160,6 +159,10 @@ public class Identifier implements Compa
return className;
}
+ public String getClassNaturalName() {
+ return NameUtils.naturalName(getClassName());
+ }
+
public String getMemberName() {
return memberName;
}
@@ -338,4 +341,5 @@ public class Identifier implements Compa
return asString;
}
+
}
Copied: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/NameUtils.java (from r1056120, incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/util/NameUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/NameUtils.java?p2=incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/NameUtils.java&p1=incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/util/NameUtils.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/util/NameUtils.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/NameUtils.java Sat Jan 8 22:53:36 2011
@@ -17,19 +17,18 @@
* under the License.
*/
-package org.apache.isis.applib.util;
+package org.apache.isis.applib;
import java.util.Collections;
import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.Identifier;
/**
* Not public API, provides a number of utilities to represent formal {@link Identifier} names more naturally.
*/
-public class NameUtils {
+class NameUtils {
private static final char SPACE = ' ';
/**
Added: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java (added)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+/**
+ * The classes in this package are used for implementing custom value types.
+ *
+ * <p>
+ * The {@link org.apache.isis.applib.adapters.ValueSemanticsProvider} interface
+ * allows the framework to recognize its corresponding type as being a value
+ * type (that is, having value semantics). The {@link org.apache.isis.applib.adapters.AbstractValueSemanticsProvider}
+ * class is an base adapter for this interface.
+ *
+ * <p>
+ * The association between {@link org.apache.isis.applib.adapters.ValueSemanticsProvider}
+ * and its corresponding type can be done in several ways. Most straightforward
+ * is to annotate the class with the {@link org.apache.isis.applib.annotation.Value}
+ * annotation. However, if the value type source code cannot be modified (for
+ * example, if it is a third-party type such as joda-time), then the association
+ * can be made using configuration properties.
+ */
+package org.apache.isis.applib.adapters;
\ No newline at end of file
Added: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java (added)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+/**
+ * This package defines all of the annotations that are recognized within
+ * the default Isis programming model.
+ *
+ * <p>
+ * For example, {@link org.apache.isis.applib.annotation.Optional} is used to
+ * indicate that a property or a parameter is optional rather than mandatory.
+ * The {@link org.apache.isis.applib.annotation.MaxLength} annotation is used
+ * to indicate the maximum length allowable for a (string) property or
+ * parameter, or to indicate the maximum length of a (string-based) value type.
+ */
+package org.apache.isis.applib.annotation;
\ No newline at end of file
Added: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/clock/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/clock/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/clock/package-info.java (added)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/clock/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+/**
+ * Defines a {@link org.apache.isis.applib.clock.Clock} singleton
+ * that can be used to obtain the current time.
+ *
+ * <p>
+ * All of the built-in value types relating to time have
+ * {@link org.apache.isis.applib.adapters.ValueSemanticsProvider#getDefaultsProvider() defaults}
+ * that use the {@link org.apache.isis.applib.clock.Clock} singleton. For
+ * consistency, domain objects and services should also use the Clock.
+ *
+ * <p>
+ * Providing a clock is useful for testing, allowing the "current" time
+ * to be placed under programmatic control (by {@link org.apache.isis.applib.fixtures.FixtureClock#initialize() initializing}
+ * a {@link org.apache.isis.applib.fixtures.FixtureClock}. Otherwise though
+ * the {@link org.apache.isis.applib.clock.Clock} just uses the time from the
+ * current system.
+ *
+ * <p>
+ * Note: this design also means that other {@link org.apache.isis.applib.clock.Clock}
+ * implementations - such as a one that accesses the time from an NNTP time
+ * daemon - could also be used.
+ */
+package org.apache.isis.applib.clock;
\ No newline at end of file
Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java Sat Jan 8 22:53:36 2011
@@ -23,7 +23,6 @@ import java.util.EventObject;
import java.util.List;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.util.NameUtils;
/**
* Represents an interaction with a domain object or a particular feature (property, collection, action) of a domain
@@ -68,8 +67,7 @@ public abstract class InteractionEvent e
}
/**
- * Convenience method that returns the {@link Identifier#getClassName() class name} of the {@link #getIdentifier()
- * identifier}.
+ * As per {@link #getClassName()}, but naturalized.
*
* @see #getIdentifier
*/
@@ -78,10 +76,11 @@ public abstract class InteractionEvent e
}
/**
- * As per {@link #getClassName()}, but {@link NameUtils#naturalName(String) naturalized}.
+ * Convenience method that returns the {@link Identifier#getClassNaturalName() natural class name} of the {@link #getIdentifier()
+ * identifier}.
*/
public String getClassNaturalName() {
- return NameUtils.naturalName(getClassName());
+ return identifier.getClassNaturalName();
}
/**
@@ -98,7 +97,7 @@ public abstract class InteractionEvent e
* As per {@link #getMemberName()}, but naturalized.
*/
public String getMemberNaturalName() {
- return NameUtils.naturalName(getMemberName());
+ return identifier.getMemberNaturalName();
}
/**
@@ -113,7 +112,7 @@ public abstract class InteractionEvent e
* As per {@link #getMemberParameterName()}, but naturalized.
*/
public List<String> getMemberParameterNaturalNames() {
- return NameUtils.naturalNames(getMemberParameterNames());
+ return identifier.getMemberParameterNaturalNames();
}
/**
Copied: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/Filter.java (from r1056120, incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Filter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/Filter.java?p2=incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/Filter.java&p1=incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Filter.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Filter.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/Filter.java Sat Jan 8 22:53:36 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib;
+package org.apache.isis.applib.filter;
/**
* For use by repository implementations to allow a set of objects returned by a back-end objectstore to be filtered
@@ -37,5 +37,5 @@ public interface Filter<T> {
* @param pojo
* @return <tt>true</tt> if this pojo is acceptable, <tt>false</tt> otherwise.
*/
- public boolean accept(T pojo);
+ public boolean accept(T t);
}
Copied: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/Filters.java (from r1056120, incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/filters/Filters.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/Filters.java?p2=incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/Filters.java&p1=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/filters/Filters.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/filters/Filters.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/Filters.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,8 @@
*/
-package org.apache.isis.core.commons.filters;
+package org.apache.isis.applib.filter;
+
public final class Filters {
@@ -26,7 +27,7 @@ public final class Filters {
private Filters() {}
public static <T> Filter<T> and(final Filter<T> f1, final Filter<T> f2) {
- return new AbstractFilter<T>() {
+ return new Filter<T>() {
@Override
public boolean accept(final T f) {
return f1.accept(f) && f2.accept(f);
@@ -35,7 +36,7 @@ public final class Filters {
}
public static <T> Filter<T> or(final Filter<T> f1, final Filter<T> f2) {
- return new AbstractFilter<T>() {
+ return new Filter<T>() {
@Override
public boolean accept(final T f) {
return f1.accept(f) || f2.accept(f);
@@ -44,16 +45,16 @@ public final class Filters {
}
public static <T> Filter<T> not(final Filter<T> f1) {
- return new AbstractFilter<T>() {
+ return new Filter<T>() {
@Override
public boolean accept(final T f) {
return !f1.accept(f);
}
};
}
-
+
public static <T> Filter<T> any() {
- return new AbstractFilter<T>() {
+ return new Filter<T>() {
@Override
public boolean accept(final T t) {
@@ -61,14 +62,22 @@ public final class Filters {
}
};
}
-
- public static <T> Filter<T> none() {
- return new AbstractFilter<T>() {
- @Override
- public boolean accept(final T f) {
- return false;
- }
- };
+
+ public final static <T> Filter<T> anyOfType(final Class<T> clazz) {
+ return any();
}
+
+ public static <T> Filter<T> none() {
+ return new Filter<T>() {
+ @Override
+ public boolean accept(final T f) {
+ return false;
+ }
+ };
+ }
+
+ public static <T> Filter<T> noneOfType(final Class<T> clazz) {
+ return none();
+ }
}
Added: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/package-info.java (added)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/filter/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+/**
+ * This package defines a {@link org.apache.isis.applib.filter.Filter} interface,
+ * useful in particular for writing (naive) repositories but also useful
+ * more generally.
+ *
+ * <p>
+ * It also defines a supporting {@link org.apache.isis.applib.filter.Filters utility class}
+ * which can be used to combine {@link org.apache.isis.applib.filter.Filter}s.
+ */
+package org.apache.isis.applib.filter;
\ No newline at end of file
Added: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/package-info.java (added)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+/**
+ * Defines the {@link org.apache.isis.applib.fixtures.InstallableFixture}
+ * interface and supporting classes.
+ *
+ * <p>
+ * Fixtures are used to initialize the system, typically for either testing
+ * or for demo/prototyping purposes. Initializing the system means:
+ * <ul>
+ * <li><p>setting up objects within the persistent object store (typically only relevant
+ * if using the in-memory object store; other object stores will generally
+ * ignore these fixtures)</p></li>
+ * <li><p>setting the current {@link org.apache.isis.applib.fixtures.DateFixture date}</p></li>
+ * <li><p>{@link org.apache.isis.applib.fixtures.SwitchUserFixture switching}
+ * the current user while fixtures are being installed (eg so that a workflow
+ * can be picked up midway through)</p></li>
+ * <li><p>specifying the {@link org.apache.isis.applib.fixtures.LogonFixture currently logged on} user once the fixtures have been installed</p></li>
+ * <li><p>setting up objects within the persistent {@link org.apache.isis.applib.fixtures.UserProfileFixture user profile}</p></li>
+ * </ul>
+ *
+ * <p>
+ * Fixtures are typically combined into a {@link org.apache.isis.applib.fixtures.CompositeFixture composite}
+ * pattern; the {@link org.apache.isis.applib.fixtures.AbstractFixture} adapter
+ * class provides built-in support for this if required.
+ */
+package org.apache.isis.applib.fixtures;
\ No newline at end of file
Added: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/package-info.java (added)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+/**
+ * Provides support for switching the current user while fixtures are
+ * being loaded.
+ *
+ * <p>
+ * Not expected to be used by domain objects, but decouples the fixtures from
+ * the framework (which provides the implementation of {@link org.apache.isis.applib.fixtures.switchuser.SwitchUserService}).
+ */
+package org.apache.isis.applib.fixtures.switchuser;
\ No newline at end of file
Added: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/userprofile/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/userprofile/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/userprofile/package-info.java (added)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/userprofile/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+/**
+ * Provides support for installing a user profile fixture.
+ *
+ * <p>
+ * Not expected to be used by domain objects, but decouples the fixtures from
+ * the framework (which provides the implementation of {@link org.apache.isis.applib.fixtures.userprofile.UserProfileService}).
+ */
+package org.apache.isis.applib.fixtures.userprofile;
\ No newline at end of file
Added: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/package-info.java (added)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+/**
+ * Marker interfaces that are used to declare semantics relating to domain
+ * types.
+ *
+ * <p>
+ * All of the interfaces defined in this package have equivalent annotations,
+ * and generally we recommend that annotations are used instead.
+ */
+package org.apache.isis.applib.marker;
\ No newline at end of file
Copied: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/maybe/Maybe.java (from r1056120, incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Maybe.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/maybe/Maybe.java?p2=incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/maybe/Maybe.java&p1=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Maybe.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Maybe.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/maybe/Maybe.java Sat Jan 8 22:53:36 2011
@@ -18,9 +18,22 @@
*/
-package org.apache.isis.core.commons.lang;
-
+package org.apache.isis.applib.maybe;
+/**
+ * As an alternative to returning null; equivalent to Scala's <tt>Option</tt>
+ * type (and Haskell's <tt>Maybe</tt>).
+ *
+ * <p>
+ * Not used by the default programming model, but may be in the
+ * future. Alternatively, you might wish to use for your own custom
+ * programming model. For example, a <tt>validateXxx()</tt> could return
+ * a <tt>Maybe<String></tt> rather than a simple nullable <tt>String</tt>.
+ *
+ * <p>
+ * May also be used by domain objects (and is used more generally by the
+ * Isis framework itself).
+ */
public final class Maybe<T> {
public final static <T> Maybe<T> setTo(T t) {