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 2012/01/22 08:36:26 UTC
svn commit: r1234456 [10/17] - in /incubator/isis/trunk/framework/runtimes:
dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/classsubstitutor/
dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/obje...
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_ClientActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_ClientActionTest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_ClientActionTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_ClientActionTest.java Sun Jan 22 07:36:07 2012
@@ -69,8 +69,9 @@ public class ServerFacadeImpl_ClientActi
private TestProxySystem system;
/*
- * Testing the Distribution implementation ServerDistribution. This uses the encoder to unmarshall objects and then
- * calls the persistor and reflector; all of which should be mocked.
+ * Testing the Distribution implementation ServerDistribution. This uses the
+ * encoder to unmarshall objects and then calls the persistor and reflector;
+ * all of which should be mocked.
*/
@Before
public void setUp() throws Exception {
@@ -101,14 +102,12 @@ public class ServerFacadeImpl_ClientActi
mockery.checking(new Expectations() {
{
- one(mockEncoder).encodeClientActionResult(with(equalTo(new ObjectData[0])),
- with(equalTo(new Version[0])), with(equalTo(new ObjectData[0])));
+ one(mockEncoder).encodeClientActionResult(with(equalTo(new ObjectData[0])), with(equalTo(new Version[0])), with(equalTo(new ObjectData[0])));
will(returnValue(new ExecuteClientActionResponse(new ObjectData[0], new Version[0], null)));
}
});
- final ExecuteClientActionRequest request =
- new ExecuteClientActionRequest(session, new ReferenceData[0], new int[0]);
+ final ExecuteClientActionRequest request = new ExecuteClientActionRequest(session, new ReferenceData[0], new int[0]);
// don't start xactn here, since within call.
final ExecuteClientActionResponse result = server.executeClientAction(request);
@@ -133,23 +132,18 @@ public class ServerFacadeImpl_ClientActi
});
// results returned in their own container
- final ExecuteClientActionResponse results =
- new ExecuteClientActionResponse(new ObjectData[0], new Version[0], null);
+ final ExecuteClientActionResponse results = new ExecuteClientActionResponse(new ObjectData[0], new Version[0], null);
mockery.checking(new Expectations() {
{
- one(mockEncoder).encodeClientActionResult(with(equalTo(new ReferenceData[1])),
- with(equalTo(new Version[] { new TestProxyVersion(2) })), with(equalTo(new ObjectData[0])));
+ one(mockEncoder).encodeClientActionResult(with(equalTo(new ReferenceData[1])), with(equalTo(new Version[] { new TestProxyVersion(2) })), with(equalTo(new ObjectData[0])));
will(returnValue(results));
}
});
- final ExecuteClientActionRequest request =
- new ExecuteClientActionRequest(session, new ReferenceData[] { data },
- new int[] { ClientTransactionEvent.CHANGE });
+ final ExecuteClientActionRequest request = new ExecuteClientActionRequest(session, new ReferenceData[] { data }, new int[] { ClientTransactionEvent.CHANGE });
// don't start xactn here, since within call.
final ExecuteClientActionResponse result = server.executeClientAction(request);
- final ObjectAdapter object =
- IsisContext.getPersistenceSession().loadObject(adapter.getOid(), adapter.getSpecification());
+ final ObjectAdapter object = IsisContext.getPersistenceSession().loadObject(adapter.getOid(), adapter.getSpecification());
assertEquals(new TestProxyVersion(2), object.getVersion());
@@ -174,25 +168,20 @@ public class ServerFacadeImpl_ClientActi
});
// return results
- final ExecuteClientActionResponse results =
- new ExecuteClientActionResponse(new ObjectData[0], new Version[0], new ObjectData[0]);
+ final ExecuteClientActionResponse results = new ExecuteClientActionResponse(new ObjectData[0], new Version[0], new ObjectData[0]);
mockery.checking(new Expectations() {
{
- one(mockEncoder).encodeClientActionResult(with(equalTo(new ReferenceData[1])),
- with(equalTo(new Version[1])), with(equalTo(new ObjectData[0])));
+ one(mockEncoder).encodeClientActionResult(with(equalTo(new ReferenceData[1])), with(equalTo(new Version[1])), with(equalTo(new ObjectData[0])));
will(returnValue(results));
}
});
// don't start xactn here, since within call.
- final ExecuteClientActionRequest request =
- new ExecuteClientActionRequest(session, new ReferenceData[] { data },
- new int[] { ClientTransactionEvent.ADD });
+ final ExecuteClientActionRequest request = new ExecuteClientActionRequest(session, new ReferenceData[] { data }, new int[] { ClientTransactionEvent.ADD });
final ExecuteClientActionResponse response = server.executeClientAction(request);
- final ObjectAdapter object =
- IsisContext.getPersistenceSession().loadObject(adapter.getOid(), adapter.getSpecification());
+ final ObjectAdapter object = IsisContext.getPersistenceSession().loadObject(adapter.getOid(), adapter.getSpecification());
assertEquals(results, response);
assertEquals(adapter, object);
@@ -205,13 +194,10 @@ public class ServerFacadeImpl_ClientActi
adapter.setOptimisticLock(new TestProxyVersion(7));
final Oid oid = adapter.getOid();
- final DummyIdentityData identityData =
- new DummyIdentityData(oid, TestProxyAdapter.class.getName(), new TestProxyVersion(6));
+ final DummyIdentityData identityData = new DummyIdentityData(oid, TestProxyAdapter.class.getName(), new TestProxyVersion(6));
try {
- final ExecuteClientActionRequest request =
- new ExecuteClientActionRequest(new TestProxySession(), new ReferenceData[] { identityData },
- new int[] { ClientTransactionEvent.DELETE });
+ final ExecuteClientActionRequest request = new ExecuteClientActionRequest(new TestProxySession(), new ReferenceData[] { identityData }, new int[] { ClientTransactionEvent.DELETE });
server.executeClientAction(request);
fail();
} catch (final ConcurrencyException expected) {
@@ -223,24 +209,19 @@ public class ServerFacadeImpl_ClientActi
final ObjectAdapter adapter = system.createPersistentTestObject();
final Oid oid = adapter.getOid();
- final DummyIdentityData identityData =
- new DummyIdentityData(oid, TestProxyAdapter.class.getName(), new TestProxyVersion(1));
+ final DummyIdentityData identityData = new DummyIdentityData(oid, TestProxyAdapter.class.getName(), new TestProxyVersion(1));
// return results
- final ExecuteClientActionResponse results =
- new ExecuteClientActionResponse(new ObjectData[0], new Version[0], null);
+ final ExecuteClientActionResponse results = new ExecuteClientActionResponse(new ObjectData[0], new Version[0], null);
mockery.checking(new Expectations() {
{
- one(mockEncoder).encodeClientActionResult(with(equalTo(new ReferenceData[1])),
- with(equalTo(new Version[1])), with(equalTo(new ObjectData[0])));
+ one(mockEncoder).encodeClientActionResult(with(equalTo(new ReferenceData[1])), with(equalTo(new Version[1])), with(equalTo(new ObjectData[0])));
will(returnValue(results));
}
});
// don't start xactn here, since within call.
- final ExecuteClientActionRequest request =
- new ExecuteClientActionRequest(new TestProxySession(), new ReferenceData[] { identityData },
- new int[] { ClientTransactionEvent.DELETE });
+ final ExecuteClientActionRequest request = new ExecuteClientActionRequest(new TestProxySession(), new ReferenceData[] { identityData }, new int[] { ClientTransactionEvent.DELETE });
final ExecuteClientActionResponse result = server.executeClientAction(request);
assertEquals(results, result);
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java Sun Jan 22 07:36:07 2012
@@ -71,11 +71,12 @@ public class ServerFacadeImpl_ParseableA
private ObjectEncoderDecoder mockObjectEncoder;
/**
- * Testing the {@link ServerFacadeImpl} implementation of {@link ServerFacade}.
+ * Testing the {@link ServerFacadeImpl} implementation of
+ * {@link ServerFacade}.
*
* <p>
- * This uses the encoder to unmarshall objects and then calls the persistor and reflector; all of which should be
- * mocked.
+ * This uses the encoder to unmarshall objects and then calls the persistor
+ * and reflector; all of which should be mocked.
*/
@Before
public void setUp() throws Exception {
@@ -103,10 +104,12 @@ public class ServerFacadeImpl_ParseableA
}
/**
- * TODO: other tests for clear: - clear collection element - fails if unauthorised - fails if unavailable
+ * TODO: other tests for clear: - clear collection element - fails if
+ * unauthorised - fails if unavailable
*
* <p>
- * could place all these clear test in one class; test other methods in other classes
+ * could place all these clear test in one class; test other methods in
+ * other classes
*/
@Test
public void testClearAssociation() {
@@ -176,8 +179,7 @@ public class ServerFacadeImpl_ParseableA
});
IsisContext.getTransactionManager().startTransaction();
- final SetValueRequest request =
- new SetValueRequest(session, "name", movieData, new DummyEncodeableObjectData("name of movie"));
+ final SetValueRequest request = new SetValueRequest(session, "name", movieData, new DummyEncodeableObjectData("name of movie"));
final SetValueResponse response = server.setValue(request);
final ObjectData[] updates = response.getUpdates();
IsisContext.getTransactionManager().endTransaction();
@@ -190,8 +192,7 @@ public class ServerFacadeImpl_ParseableA
public void testSetAssociationFailsWithNonCurrentTarget() {
try {
object.setOptimisticLock(new TestProxyVersion(2));
- final SetValueRequest request =
- new SetValueRequest(session, "name", movieData, new DummyEncodeableObjectData("name of movie"));
+ final SetValueRequest request = new SetValueRequest(session, "name", movieData, new DummyEncodeableObjectData("name of movie"));
server.setValue(request);
fail();
} catch (final ConcurrencyException expected) {
@@ -202,8 +203,7 @@ public class ServerFacadeImpl_ParseableA
public void testSetAssociationFailsWhenInvisible() {
nameField.setUpIsVisible(false);
try {
- final SetValueRequest request =
- new SetValueRequest(session, "name", movieData, new DummyEncodeableObjectData("name of movie"));
+ final SetValueRequest request = new SetValueRequest(session, "name", movieData, new DummyEncodeableObjectData("name of movie"));
server.setValue(request);
fail();
} catch (final IsisException expected) {
@@ -215,8 +215,7 @@ public class ServerFacadeImpl_ParseableA
public void testSetAssociationFailsWhenUnavailable() {
nameField.setUpIsUnusableFor(object);
try {
- final SetValueRequest request =
- new SetValueRequest(session, "name", movieData, new DummyEncodeableObjectData("test data"));
+ final SetValueRequest request = new SetValueRequest(session, "name", movieData, new DummyEncodeableObjectData("test data"));
server.setValue(request);
fail();
} catch (final IsisException expected) {
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_RemoteActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_RemoteActionTest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_RemoteActionTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/server/ServerFacadeImpl_RemoteActionTest.java Sun Jan 22 07:36:07 2012
@@ -72,8 +72,9 @@ public class ServerFacadeImpl_RemoteActi
private ObjectAction mockAction;
/*
- * Testing the Distribution implementation ServerDistribution. This uses the encoder to unmarshall objects and then
- * calls the persistor and reflector; all of which should be mocked.
+ * Testing the Distribution implementation ServerDistribution. This uses the
+ * encoder to unmarshall objects and then calls the persistor and reflector;
+ * all of which should be mocked.
*/
@Before
public void setUp() throws Exception {
@@ -122,18 +123,14 @@ public class ServerFacadeImpl_RemoteActi
final ExecuteServerActionResponse results = null;
mockery.checking(new Expectations() {
{
- one(mockEncoder).encodeServerActionResult(with(equalTo(adapter)), with(equalTo(new ObjectData[0])),
- with(equalTo(new ReferenceData[0])), with(nullValue(ObjectData.class)),
- with(equalTo(new ObjectData[0])), with(equalTo(new String[0])), with(equalTo(new String[0])));
+ one(mockEncoder).encodeServerActionResult(with(equalTo(adapter)), with(equalTo(new ObjectData[0])), with(equalTo(new ReferenceData[0])), with(nullValue(ObjectData.class)), with(equalTo(new ObjectData[0])), with(equalTo(new String[0])), with(equalTo(new String[0])));
will(returnValue(results));
}
});
IsisContext.getTransactionManager().startTransaction();
- final ExecuteServerActionRequest request =
- new ExecuteServerActionRequest(new TestProxySession(), ActionType.USER, "action()", targetData,
- parameterData);
+ final ExecuteServerActionRequest request = new ExecuteServerActionRequest(new TestProxySession(), ActionType.USER, "action()", targetData, parameterData);
final ExecuteServerActionResponse result = server.executeServerAction(request);
IsisContext.getTransactionManager().endTransaction();
@@ -146,15 +143,12 @@ public class ServerFacadeImpl_RemoteActi
mockery.checking(new Expectations() {
{
- final ReferenceData deletedObjectIdentityData =
- new DummyReferenceData(adapter.getOid(), "", adapter.getVersion());
+ final ReferenceData deletedObjectIdentityData = new DummyReferenceData(adapter.getOid(), "", adapter.getVersion());
one(mockEncoder).encodeIdentityData(adapter);
will(returnValue(deletedObjectIdentityData));
- one(mockEncoder).encodeServerActionResult(with(equalTo(adapter)), with(equalTo(new ObjectData[0])),
- with(equalTo(new ReferenceData[] { deletedObjectIdentityData })),
- with(nullValue(ObjectData.class)), with(equalTo(new ObjectData[0])), with(equalTo(new String[0])),
- with(equalTo(new String[0])));
+ one(mockEncoder).encodeServerActionResult(with(equalTo(adapter)), with(equalTo(new ObjectData[0])), with(equalTo(new ReferenceData[] { deletedObjectIdentityData })), with(nullValue(ObjectData.class)), with(equalTo(new ObjectData[0])), with(equalTo(new String[0])),
+ with(equalTo(new String[0])));
will(returnValue(null));
}
});
@@ -162,9 +156,7 @@ public class ServerFacadeImpl_RemoteActi
IsisContext.getTransactionManager().startTransaction();
IsisContext.getUpdateNotifier().addDisposedObject(adapter);
- final ExecuteServerActionRequest request =
- new ExecuteServerActionRequest(new TestProxySession(), ActionType.USER, "action()", targetData,
- parameterData);
+ final ExecuteServerActionRequest request = new ExecuteServerActionRequest(new TestProxySession(), ActionType.USER, "action()", targetData, parameterData);
final ExecuteServerActionResponse result = server.executeServerAction(request);
IsisContext.getTransactionManager().endTransaction();
@@ -182,10 +174,8 @@ public class ServerFacadeImpl_RemoteActi
one(mockEncoder).encodeForUpdate(adapter);
will(returnValue(changedObjectData));
- one(mockEncoder).encodeServerActionResult(with(equalTo(adapter)),
- with(equalTo(new ObjectData[] { changedObjectData })), with(equalTo(new ReferenceData[0])),
- with(nullValue(ObjectData.class)), with(equalTo(new ObjectData[0])), with(equalTo(new String[0])),
- with(equalTo(new String[0])));
+ one(mockEncoder).encodeServerActionResult(with(equalTo(adapter)), with(equalTo(new ObjectData[] { changedObjectData })), with(equalTo(new ReferenceData[0])), with(nullValue(ObjectData.class)), with(equalTo(new ObjectData[0])), with(equalTo(new String[0])),
+ with(equalTo(new String[0])));
will(returnValue(null));
}
});
@@ -194,9 +184,7 @@ public class ServerFacadeImpl_RemoteActi
IsisContext.getUpdateNotifier().addChangedObject(adapter);
- final ExecuteServerActionRequest request =
- new ExecuteServerActionRequest(new TestProxySession(), ActionType.USER, "action()", targetData,
- parameterData);
+ final ExecuteServerActionRequest request = new ExecuteServerActionRequest(new TestProxySession(), ActionType.USER, "action()", targetData, parameterData);
final ExecuteServerActionResponse result = server.executeServerAction(request);
IsisContext.getTransactionManager().endTransaction();
@@ -209,10 +197,8 @@ public class ServerFacadeImpl_RemoteActi
final ExecuteServerActionResponse results = null;
mockery.checking(new Expectations() {
{
- one(mockEncoder).encodeServerActionResult(with(equalTo(adapter)), with(equalTo(new ObjectData[0])),
- with(equalTo(new ReferenceData[0])), with(nullValue(ObjectData.class)),
- with(equalTo(new ObjectData[0])), with(equalTo(new String[] { "message 1", "message 2" })),
- with(equalTo(new String[] { "warning 1", "warning 2" })));
+ one(mockEncoder).encodeServerActionResult(with(equalTo(adapter)), with(equalTo(new ObjectData[0])), with(equalTo(new ReferenceData[0])), with(nullValue(ObjectData.class)), with(equalTo(new ObjectData[0])), with(equalTo(new String[] { "message 1", "message 2" })),
+ with(equalTo(new String[] { "warning 1", "warning 2" })));
will(returnValue(null));
}
});
@@ -225,9 +211,7 @@ public class ServerFacadeImpl_RemoteActi
IsisContext.getMessageBroker().addWarning("warning 1");
IsisContext.getMessageBroker().addWarning("warning 2");
- final ExecuteServerActionRequest request =
- new ExecuteServerActionRequest(new TestProxySession(), ActionType.USER, "action()", targetData,
- parameterData);
+ final ExecuteServerActionRequest request = new ExecuteServerActionRequest(new TestProxySession(), ActionType.USER, "action()", targetData, parameterData);
final ExecuteServerActionResponse result = server.executeServerAction(request);
IsisContext.getTransactionManager().endTransaction();
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-encode/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/encode/EncodingMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-encode/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/encode/EncodingMarshaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-encode/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/encode/EncodingMarshaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-encode/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/encode/EncodingMarshaller.java Sun Jan 22 07:36:07 2012
@@ -57,7 +57,8 @@ public class EncodingMarshaller extends
@Override
public <T> T readObject(final DataInputExtended input, final Class<T> cls) throws IOException {
- // not quite symmetrical with write; the byte has already been read from stream
+ // not quite symmetrical with write; the byte has already been
+ // read from stream
// to determine which As instance to delegate to
return input.readEncodable(cls);
}
@@ -71,7 +72,8 @@ public class EncodingMarshaller extends
@Override
public <T> T readObject(final DataInputExtended input, final Class<T> cls) throws IOException {
- // not quite symmetrical with write; the byte has already been read from stream
+ // not quite symmetrical with write; the byte has already been
+ // read from stream
// to determine which As instance to delegate to
return input.readSerializable(cls);
}
@@ -121,8 +123,7 @@ public class EncodingMarshaller extends
@Override
public void init() {
super.init();
- debugging =
- getConfiguration().getBoolean(MarshallingConstants.DEBUGGING_KEY, MarshallingConstants.DEBUGGING_DEFAULT);
+ debugging = getConfiguration().getBoolean(MarshallingConstants.DEBUGGING_KEY, MarshallingConstants.DEBUGGING_DEFAULT);
if (LOG.isInfoEnabled()) {
LOG.info("debugging=" + debugging);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-serialize/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/serialize/SerializingMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-serialize/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/serialize/SerializingMarshaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-serialize/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/serialize/SerializingMarshaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-serialize/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/serialize/SerializingMarshaller.java Sun Jan 22 07:36:07 2012
@@ -34,7 +34,6 @@ import org.apache.isis.runtimes.dflt.rem
import org.apache.isis.runtimes.dflt.remoting.transport.Transport;
import org.apache.log4j.Logger;
-
public class SerializingMarshaller extends MarshallerAbstract {
private static final Logger LOG = Logger.getLogger(SerializingMarshaller.class);
@@ -82,9 +81,11 @@ public class SerializingMarshaller exten
}
return object;
/*
- * } catch (StreamCorruptedException e) { try { int available = input.available();
- * LOG.debug("error in reading; skipping bytes: " + available); input.skip(available); } catch (IOException
- * e1) { e1.printStackTrace(); } throw new ConnectionException(e.getMessage(), e);
+ * } catch (StreamCorruptedException e) { try { int available =
+ * input.available(); LOG.debug("error in reading; skipping bytes: "
+ * + available); input.skip(available); } catch (IOException e1) {
+ * e1.printStackTrace(); } throw new
+ * ConnectionException(e.getMessage(), e);
*/
} catch (final ClassNotFoundException e) {
throw new ConnectionException("Failed request", e);
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java Sun Jan 22 07:36:07 2012
@@ -36,7 +36,8 @@ public class XStreamOverSocketsProxyDeco
@Override
protected void addConfigurationResources(final List<String> configurationResources) {
super.addConfigurationResources(configurationResources);
- // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+ // TODO: this (small) hack is because we don't load up the Protocol
+ // (Marshaller)
// and Transport using the installers.
configurationResources.add("protocol.properties");
configurationResources.add("protocol_xstream.properties");
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java Sun Jan 22 07:36:07 2012
@@ -39,8 +39,7 @@ public class XStreamOverSocketsViewer ex
}
@Override
- protected ServerConnection createServerConnection(final InputStream input, final OutputStream output,
- final ServerFacade distribution) {
+ protected ServerConnection createServerConnection(final InputStream input, final OutputStream output, final ServerFacade distribution) {
final SimpleTransport transport = new SimpleTransport(getConfiguration(), input, output);
final XStreamMarshaller serverMarshaller = new XStreamMarshaller(getConfiguration(), transport);
try {
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/src/main/java/org/apache/isis/runtimes/dflt/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java Sun Jan 22 07:36:07 2012
@@ -28,12 +28,12 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer;
/**
- * Implementation of a {@link IsisViewer} providing the ability to run from server as a {@link Isis command line}
- * application.
+ * Implementation of a {@link IsisViewer} providing the ability to run from
+ * server as a {@link Isis command line} application.
*
* <p>
- * To run, use the <tt>--viewer xstream-sockets</tt> flag. The client-side should run using
- * <tt>--connector xstream-sockets</tt> flag.
+ * To run, use the <tt>--viewer xstream-sockets</tt> flag. The client-side
+ * should run using <tt>--connector xstream-sockets</tt> flag.
*/
public class XStreamOverSocketsViewerInstaller extends SocketsViewerInstallerAbstract {
@@ -44,7 +44,8 @@ public class XStreamOverSocketsViewerIns
@Override
protected void addConfigurationResources(final List<String> configurationResources) {
super.addConfigurationResources(configurationResources);
- // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+ // TODO: this (small) hack is because we don't load up the Protocol
+ // (Marshaller)
// and Transport using the installers.
configurationResources.add("protocol.properties");
configurationResources.add("protocol_xstream.properties");
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java Sun Jan 22 07:36:07 2012
@@ -34,7 +34,8 @@ public class EncodingOverHttpProxyInstal
@Override
protected void addConfigurationResources(final List<String> configurationResources) {
super.addConfigurationResources(configurationResources);
- // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+ // TODO: this (small) hack is because we don't load up the Protocol
+ // (Marshaller)
// and Transport using the installers.
configurationResources.add("protocol.properties");
configurationResources.add("protocol_encoding.properties");
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/HttpClientTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/HttpClientTransport.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/HttpClientTransport.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/HttpClientTransport.java Sun Jan 22 07:36:07 2012
@@ -79,8 +79,8 @@ public class HttpClientTransport extends
// ///////////////////////////////////////////////////////////
/**
- * Returns an {@link OutputStream} that writes into the request body of an HTTP POST, and will send on
- * {@link OutputStream#flush() flush}.
+ * Returns an {@link OutputStream} that writes into the request body of an
+ * HTTP POST, and will send on {@link OutputStream#flush() flush}.
*/
@Override
public OutputStream getOutputStream() {
@@ -88,10 +88,12 @@ public class HttpClientTransport extends
}
/**
- * When first called, executes the HTTP POST, then returns the response body.
+ * When first called, executes the HTTP POST, then returns the response
+ * body.
*
* <p>
- * Subsequent calls return the same input stream, at whatever position they have been processed.
+ * Subsequent calls return the same input stream, at whatever position they
+ * have been processed.
*/
@Override
public InputStream getInputStream() throws IOException {
@@ -102,8 +104,7 @@ public class HttpClientTransport extends
final PostMethod postMethod = new PostMethod(url);
// copy over
- final InputStreamRequestEntity requestEntity =
- new InputStreamRequestEntity(new ByteArrayInputStream(outputStream.toByteArray()));
+ final InputStreamRequestEntity requestEntity = new InputStreamRequestEntity(new ByteArrayInputStream(outputStream.toByteArray()));
postMethod.setRequestEntity(requestEntity);
// execute
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/HttpRemotingConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/HttpRemotingConstants.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/HttpRemotingConstants.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-client/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/client/HttpRemotingConstants.java Sun Jan 22 07:36:07 2012
@@ -26,7 +26,8 @@ public class HttpRemotingConstants {
private static final String ROOT = ConfigurationConstants.ROOT + "transport.http.";
/**
- * Key used to lookup URL to which the <tt>EncodingOverHttpRemotingServlet</tt> is mapped.
+ * Key used to lookup URL to which the
+ * <tt>EncodingOverHttpRemotingServlet</tt> is mapped.
*/
public static final String URL_KEY = ROOT + "url";
/**
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-server/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-server/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-server/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-server/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java Sun Jan 22 07:36:07 2012
@@ -40,7 +40,8 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper;
/**
- * Analogous to {@link SocketsViewerAbstract}; both ultimately delegate to {@link ServerConnectionHandler}.
+ * Analogous to {@link SocketsViewerAbstract}; both ultimately delegate to
+ * {@link ServerConnectionHandler}.
*/
public class EncodingOverHttpRemotingServlet extends HttpServlet {
@@ -62,8 +63,7 @@ public class EncodingOverHttpRemotingSer
}
@Override
- protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
- throws ServletException, IOException {
+ protected void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
final ServletInputStream inputStream = request.getInputStream();
final ServletOutputStream outputStream = response.getOutputStream();
@@ -80,8 +80,7 @@ public class EncodingOverHttpRemotingSer
}
}
- private ServerConnection createConnection(final ServletInputStream inputStream,
- final ServletOutputStream outputStream) throws IOException {
+ private ServerConnection createConnection(final ServletInputStream inputStream, final ServletOutputStream outputStream) throws IOException {
// TODO: should use installers to create these,
// provides the opportunity to read in installer-specific config files.
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-server/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-server/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-server/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/transport-http-server/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.java Sun Jan 22 07:36:07 2012
@@ -28,16 +28,17 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.web.EmbeddedWebViewer;
/**
- * Convenience implementation of a {@link IsisViewer} providing the ability to run a Jetty web server configured for
- * http remoting from the {@link Isis command line}.
+ * Convenience implementation of a {@link IsisViewer} providing the ability to
+ * run a Jetty web server configured for http remoting from the {@link Isis
+ * command line}.
*
* <p>
- * To run, use the <tt>--viewer encoding-http</tt> flag. The client-side should run using
- * <tt>--connector encoding-http</tt> flag.
+ * To run, use the <tt>--viewer encoding-http</tt> flag. The client-side should
+ * run using <tt>--connector encoding-http</tt> flag.
*
* <p>
- * In a production deployment the configuration represented by the {@link WebAppSpecification} would be specified in the
- * <tt>web.xml<tt> file.
+ * In a production deployment the configuration represented by the
+ * {@link WebAppSpecification} would be specified in the <tt>web.xml<tt> file.
*/
public class EncodingOverHttpRemotingViewerInstaller extends IsisViewerInstallerAbstract {
@@ -50,7 +51,8 @@ public class EncodingOverHttpRemotingVie
@Override
protected void addConfigurationResources(final List<String> configurationResources) {
super.addConfigurationResources(configurationResources);
- // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+ // TODO: this (small) hack is because we don't load up the Protocol
+ // (Marshaller)
// and Transport using the installers.
configurationResources.add("protocol.properties");
configurationResources.add("protocol_encoding.properties");
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java Sun Jan 22 07:36:07 2012
@@ -36,7 +36,8 @@ public class EncodingOverSocketsProxyIns
@Override
protected void addConfigurationResources(final List<String> configurationResources) {
super.addConfigurationResources(configurationResources);
- // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+ // TODO: this (small) hack is because we don't load up the Protocol
+ // (Marshaller)
// and Transport using the installers.
configurationResources.add("protocol.properties");
configurationResources.add("protocol_encoding.properties");
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java Sun Jan 22 07:36:07 2012
@@ -36,7 +36,8 @@ public class SerializingOverSocketsProxy
@Override
protected void addConfigurationResources(final List<String> configurationResources) {
super.addConfigurationResources(configurationResources);
- // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+ // TODO: this (small) hack is because we don't load up the Protocol
+ // (Marshaller)
// and Transport using the installers.
configurationResources.add("protocol.properties");
configurationResources.add("protocol_serializing.properties");
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/EncodingOverSocketsViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/EncodingOverSocketsViewer.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/EncodingOverSocketsViewer.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/EncodingOverSocketsViewer.java Sun Jan 22 07:36:07 2012
@@ -37,8 +37,7 @@ public class EncodingOverSocketsViewer e
}
@Override
- protected ServerConnectionDefault createServerConnection(final InputStream input, final OutputStream output,
- final ServerFacade serverFacade) {
+ protected ServerConnectionDefault createServerConnection(final InputStream input, final OutputStream output, final ServerFacade serverFacade) {
final SimpleTransport transport = new SimpleTransport(getConfiguration(), input, output);
final EncodingMarshaller marshaller = new EncodingMarshaller(getConfiguration(), transport);
try {
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java Sun Jan 22 07:36:07 2012
@@ -26,12 +26,12 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer;
/**
- * Implementation of a {@link IsisViewer} providing the ability to run from server as a {@link Isis command line}
- * application.
+ * Implementation of a {@link IsisViewer} providing the ability to run from
+ * server as a {@link Isis command line} application.
*
* <p>
- * To run, use the <tt>--viewer encoding-sockets</tt> flag. The client-side should run using
- * <tt>--connector encoding-sockets</tt> flag.
+ * To run, use the <tt>--viewer encoding-sockets</tt> flag. The client-side
+ * should run using <tt>--connector encoding-sockets</tt> flag.
*/
public class EncodingOverSocketsViewerInstaller extends SocketsViewerInstallerAbstract {
@@ -42,7 +42,8 @@ public class EncodingOverSocketsViewerIn
@Override
protected void addConfigurationResources(final List<String> configurationResources) {
super.addConfigurationResources(configurationResources);
- // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+ // TODO: this (small) hack is because we don't load up the Protocol
+ // (Marshaller)
// and Transport using the installers.
configurationResources.add("protocol.properties");
configurationResources.add("protocol_encoding.properties");
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SerializingOverSocketsViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SerializingOverSocketsViewer.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SerializingOverSocketsViewer.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SerializingOverSocketsViewer.java Sun Jan 22 07:36:07 2012
@@ -38,8 +38,7 @@ public class SerializingOverSocketsViewe
}
@Override
- protected ServerConnection createServerConnection(final InputStream input, final OutputStream output,
- final ServerFacade serverFacade) {
+ protected ServerConnection createServerConnection(final InputStream input, final OutputStream output, final ServerFacade serverFacade) {
final SimpleTransport transport = new SimpleTransport(getConfiguration(), input, output);
final SerializingMarshaller serverMarshaller = new SerializingMarshaller(getConfiguration(), transport);
try {
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java Sun Jan 22 07:36:07 2012
@@ -26,12 +26,12 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer;
/**
- * Implementation of a {@link IsisViewer} providing the ability to run from server as a {@link Isis command line}
- * application.
+ * Implementation of a {@link IsisViewer} providing the ability to run from
+ * server as a {@link Isis command line} application.
*
* <p>
- * To run, use the <tt>--viewer serializing-sockets</tt> flag. The client-side should run using
- * <tt>--connector serializing-sockets</tt> flag.
+ * To run, use the <tt>--viewer serializing-sockets</tt> flag. The client-side
+ * should run using <tt>--connector serializing-sockets</tt> flag.
*/
public class SerializingOverSocketsViewerInstaller extends SocketsViewerInstallerAbstract {
@@ -42,7 +42,8 @@ public class SerializingOverSocketsViewe
@Override
protected void addConfigurationResources(final List<String> configurationResources) {
super.addConfigurationResources(configurationResources);
- // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+ // TODO: this (small) hack is because we don't load up the Protocol
+ // (Marshaller)
// and Transport using the installers.
configurationResources.add("protocol.properties");
configurationResources.add("protocol_serializing.properties");
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SocketsViewerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SocketsViewerAbstract.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SocketsViewerAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/server/SocketsViewerAbstract.java Sun Jan 22 07:36:07 2012
@@ -68,14 +68,14 @@ public abstract class SocketsViewerAbstr
// ////////////////////////////////////////////////////////////////
/**
- * TODO: generalize so can listen on multi-homed hosts using new Socket(port, 2, address);
+ * TODO: generalize so can listen on multi-homed hosts using new
+ * Socket(port, 2, address);
*/
@Override
public void init() {
super.init();
- final int port =
- getConfiguration().getInteger(SocketsViewerConstants.SERVER_PORT, SocketTransportConstants.PORT_DEFAULT);
+ final int port = getConfiguration().getInteger(SocketsViewerConstants.SERVER_PORT, SocketTransportConstants.PORT_DEFAULT);
workerPool = new WorkerPool(5);
@@ -125,7 +125,8 @@ public abstract class SocketsViewerAbstr
worker.setIncomingConnection(connection);
// worker.start();
- // main thread accepts new connection - have a connection - therefore implicitly a request
+ // main thread accepts new connection - have a connection -
+ // therefore implicitly a request
// get worker; associate with connection
// receive request
@@ -209,8 +210,7 @@ public abstract class SocketsViewerAbstr
/**
* Hook method.
*/
- protected abstract ServerConnection createServerConnection(final InputStream input, final OutputStream output,
- final ServerFacade serverFacade);
+ protected abstract ServerConnection createServerConnection(final InputStream input, final OutputStream output, final ServerFacade serverFacade);
// ////////////////////////////////////////////////////////////////
// debugging
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/shared/SocketTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/shared/SocketTransport.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/shared/SocketTransport.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-sockets/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/sockets/shared/SocketTransport.java Sun Jan 22 07:36:07 2012
@@ -60,9 +60,7 @@ public class SocketTransport extends Tra
public void init() {
port = getConfiguration().getInteger(SocketTransportConstants.PORT_KEY, PORT_DEFAULT);
host = getConfiguration().getString(SocketTransportConstants.HOST_KEY, SocketTransportConstants.HOST_DEFAULT);
- profiling =
- getConfiguration().getBoolean(SocketTransportConstants.PROFILING_KEY,
- SocketTransportConstants.PROFILING_DEFAULT);
+ profiling = getConfiguration().getBoolean(SocketTransportConstants.PROFILING_KEY, SocketTransportConstants.PROFILING_DEFAULT);
LOG.info("connections will be made to " + host + " " + port);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/IsisInstallerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/IsisInstallerRegistry.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/IsisInstallerRegistry.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/IsisInstallerRegistry.java Sun Jan 22 07:36:07 2012
@@ -3,16 +3,20 @@ package org.apache.isis.runtimes.dflt.ru
import java.io.InputStream;
/**
- * 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
+ * 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.
+ * 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.
*/
public final class IsisInstallerRegistry {
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/RuntimeBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/RuntimeBootstrapper.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/RuntimeBootstrapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/RuntimeBootstrapper.java Sun Jan 22 07:36:07 2012
@@ -110,7 +110,8 @@ final class RuntimeBootstrapper implemen
}
/**
- * Starts all the web {@link IsisViewer viewer}s in an instance of an {@link EmbeddedWebServer}.
+ * Starts all the web {@link IsisViewer viewer}s in an instance of an
+ * {@link EmbeddedWebServer}.
*/
private void startWebViewers(final Injector injector, final List<IsisViewer> webViewers) {
if (webViewers.size() == 0) {
@@ -120,8 +121,7 @@ final class RuntimeBootstrapper implemen
final InstallerLookup installerLookup = injector.getInstance(InstallerLookup.class);
// TODO: we could potentially offer pluggability here
- final EmbeddedWebServerInstaller webServerInstaller =
- installerLookup.embeddedWebServerInstaller(Isis.DEFAULT_EMBEDDED_WEBSERVER);
+ final EmbeddedWebServerInstaller webServerInstaller = installerLookup.embeddedWebServerInstaller(Isis.DEFAULT_EMBEDDED_WEBSERVER);
final EmbeddedWebServer embeddedWebServer = webServerInstaller.createEmbeddedWebServer();
for (final IsisViewer viewer : webViewers) {
final WebAppSpecification webContainerRequirements = viewer.getWebAppSpecification();
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java Sun Jan 22 07:36:07 2012
@@ -30,19 +30,21 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
/**
- * A refinement of the {@link AuthenticationManagerStandard}, which adds support to make it
- * easier without the palava of logging in when running in either
- * {@link DeploymentType#EXPLORATION exploration} mode or in {@link DeploymentType#PROTOTYPE prototype}
- * mode.
+ * A refinement of the {@link AuthenticationManagerStandard}, which adds support
+ * to make it easier without the palava of logging in when running in either
+ * {@link DeploymentType#EXPLORATION exploration} mode or in
+ * {@link DeploymentType#PROTOTYPE prototype} mode.
*
* <p>
* Specifically:
* <ul>
* <li>the {@link ExplorationAuthenticator} will always provide a special
- * {@link ExplorationSession} if running in the {@link DeploymentType} of {@link DeploymentType#EXPLORATION exploration}.
+ * {@link ExplorationSession} if running in the {@link DeploymentType} of
+ * {@link DeploymentType#EXPLORATION exploration}.
* <li>the {@link LogonFixtureAuthenticator} will set up a session using the
- * login provided by a {@link LogonFixture}, provided that the {@link DeploymentType} is {@link DeploymentType#EXPLORATION exploration}
- * or {@link DeploymentType#PROTOTYPE prototyping}
+ * login provided by a {@link LogonFixture}, provided that the
+ * {@link DeploymentType} is {@link DeploymentType#EXPLORATION exploration} or
+ * {@link DeploymentType#PROTOTYPE prototyping}
* </ul>
*/
public class AuthenticationManagerStandardForDfltRuntime extends AuthenticationManagerStandard {
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java Sun Jan 22 07:36:07 2012
@@ -22,8 +22,7 @@ package org.apache.isis.runtimes.dflt.ru
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
-public abstract class AuthenticationManagerStandardInstallerAbstractForDfltRuntime extends
- AuthenticationManagerStandardInstallerAbstract {
+public abstract class AuthenticationManagerStandardInstallerAbstractForDfltRuntime extends AuthenticationManagerStandardInstallerAbstract {
public AuthenticationManagerStandardInstallerAbstractForDfltRuntime(final String name) {
super(name);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticatorAbstractForDfltRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticatorAbstractForDfltRuntime.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticatorAbstractForDfltRuntime.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticatorAbstractForDfltRuntime.java Sun Jan 22 07:36:07 2012
@@ -35,13 +35,13 @@ public abstract class AuthenticatorAbstr
// //////////////////////////////////////////////////////
/**
- * Helper method for convenience of implementations that depend on the {@link DeploymentType}.
+ * Helper method for convenience of implementations that depend on the
+ * {@link DeploymentType}.
*/
public DeploymentType getDeploymentType() {
final String deploymentTypeStr = getConfiguration().getString(SystemConstants.DEPLOYMENT_TYPE_KEY);
if (deploymentTypeStr == null) {
- throw new IllegalStateException("Expect value for '" + SystemConstants.DEPLOYMENT_TYPE_KEY
- + "' to be bound into IsisConfiguration");
+ throw new IllegalStateException("Expect value for '" + SystemConstants.DEPLOYMENT_TYPE_KEY + "' to be bound into IsisConfiguration");
}
return DeploymentType.lookup(deploymentTypeStr);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/exploration/AuthenticationRequestExploration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/exploration/AuthenticationRequestExploration.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/exploration/AuthenticationRequestExploration.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/exploration/AuthenticationRequestExploration.java Sun Jan 22 07:36:07 2012
@@ -25,7 +25,8 @@ import org.apache.isis.applib.fixtures.L
import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
/**
- * For testing purposes, requests corresponding to an {@link ExplorationSession}.
+ * For testing purposes, requests corresponding to an {@link ExplorationSession}
+ * .
*/
public class AuthenticationRequestExploration extends AuthenticationRequestAbstract {
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/exploration/ExplorationAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/exploration/ExplorationAuthenticator.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/exploration/ExplorationAuthenticator.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/exploration/ExplorationAuthenticator.java Sun Jan 22 07:36:07 2012
@@ -33,17 +33,21 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
/**
- * Creates a session suitable for {@link DeploymentType#EXPLORATION exploration} mode.
+ * Creates a session suitable for {@link DeploymentType#EXPLORATION exploration}
+ * mode.
*
* <p>
- * If the {@link IsisConfiguration} contains the key {@value ExplorationAuthenticatorConstants#USERS} then
- * returns a {@link MultiUserExplorationSession} which encapsulates the details of several users (and their roles).
- * Viewers that are aware of this capability can offer the convenient ability to switch between these users. For viewers
- * that are not aware, the {@link MultiUserExplorationSession} appears as a regular {@link SimpleSession session}, with
- * the Id of the first user listed.
+ * If the {@link IsisConfiguration} contains the key
+ * {@value ExplorationAuthenticatorConstants#USERS} then returns a
+ * {@link MultiUserExplorationSession} which encapsulates the details of several
+ * users (and their roles). Viewers that are aware of this capability can offer
+ * the convenient ability to switch between these users. For viewers that are
+ * not aware, the {@link MultiUserExplorationSession} appears as a regular
+ * {@link SimpleSession session}, with the Id of the first user listed.
*
* <p>
- * The format of the {@value ExplorationAuthenticatorConstants#USERS} key should be:
+ * The format of the {@value ExplorationAuthenticatorConstants#USERS} key should
+ * be:
*
* <pre>
* &lt:userName> [:<role>[|<role>]...], <userName>...
@@ -108,7 +112,8 @@ public class ExplorationAuthenticator ex
}
/**
- * Valid providing running in {@link DeploymentType#isExploring() exploration} mode.
+ * Valid providing running in {@link DeploymentType#isExploring()
+ * exploration} mode.
*/
@Override
public final boolean isValid(final AuthenticationRequest request) {
@@ -117,11 +122,9 @@ public class ExplorationAuthenticator ex
@Override
public AuthenticationSession authenticate(final AuthenticationRequest request, final String code) {
- final AuthenticationRequestExploration authenticationRequestExploration =
- (AuthenticationRequestExploration) request;
+ final AuthenticationRequestExploration authenticationRequestExploration = (AuthenticationRequestExploration) request;
if (!authenticationRequestExploration.isDefaultUser()) {
- registeredSessions.add(createSimpleSession(authenticationRequestExploration.getName(),
- authenticationRequestExploration.getRoles()));
+ registeredSessions.add(createSimpleSession(authenticationRequestExploration.getName(), authenticationRequestExploration.getRoles()));
}
if (registeredSessions.size() > 1) {
return new MultiUserExplorationSession(registeredSessions, code);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/fixture/LogonFixtureAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/fixture/LogonFixtureAuthenticator.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/fixture/LogonFixtureAuthenticator.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/fixture/LogonFixtureAuthenticator.java Sun Jan 22 07:36:07 2012
@@ -40,8 +40,8 @@ public class LogonFixtureAuthenticator e
}
/**
- * Valid providing running in {@link DeploymentType#isExploring() exploration} or
- * {@link DeploymentType#isPrototyping() prototyping} mode.
+ * Valid providing running in {@link DeploymentType#isExploring()
+ * exploration} or {@link DeploymentType#isPrototyping() prototyping} mode.
*/
@Override
public final boolean isValid(final AuthenticationRequest request) {
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java Sun Jan 22 07:36:07 2012
@@ -38,8 +38,7 @@ public abstract class ObjectResolveAndOb
protected final ObjectChanger objectChanger;
protected final SpecificationLoader specificationLoader;
- public ObjectResolveAndObjectChangedEnhancerAbstract(final ObjectResolver objectResolver,
- final ObjectChanger objectChanger, final SpecificationLoader specificationLoader) {
+ public ObjectResolveAndObjectChangedEnhancerAbstract(final ObjectResolver objectResolver, final ObjectChanger objectChanger, final SpecificationLoader specificationLoader) {
ensureThatArg(objectResolver, is(notNullValue()));
ensureThatArg(objectChanger, is(notNullValue()));
ensureThatArg(specificationLoader, is(notNullValue()));
@@ -50,7 +49,8 @@ public abstract class ObjectResolveAndOb
}
/**
- * Subclasses should call from their constructor, and setup their implementation-specific callback mechanism.
+ * Subclasses should call from their constructor, and setup their
+ * implementation-specific callback mechanism.
*/
protected abstract void createCallback();
@@ -61,8 +61,7 @@ public abstract class ObjectResolveAndOb
protected ObjectSpecificationDefault getJavaSpecification(final Class<?> cls) {
final ObjectSpecification nos = getSpecification(cls);
if (!(nos instanceof ObjectSpecificationDefault)) {
- throw new UnsupportedOperationException("Only Java is supported (specification is '"
- + nos.getClass().getCanonicalName() + "')");
+ throw new UnsupportedOperationException("Only Java is supported (specification is '" + nos.getClass().getCanonicalName() + "')");
}
return (ObjectSpecificationDefault) nos;
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java Sun Jan 22 07:36:07 2012
@@ -77,8 +77,7 @@ public class ObjectFixtureFilePersistor
ObjectAdapter object = idMap.get(id);
if (object == null) {
final String className = data.substring(0, pos);
- final ObjectSpecification specification =
- IsisContext.getSpecificationLoader().loadSpecification(className);
+ final ObjectSpecification specification = IsisContext.getSpecificationLoader().loadSpecification(className);
object = IsisContext.getPersistenceSession().createInstance(specification);
idMap.put(id, object);
objects.add(object.getObject());
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstaller.java Sun Jan 22 07:36:07 2012
@@ -19,18 +19,19 @@
package org.apache.isis.runtimes.dflt.runtime.fixtures;
+import org.apache.isis.applib.fixtures.InstallableFixture;
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.components.Installer;
-
/**
* A particular mechanism to install fixtures.
*/
public interface FixturesInstaller extends Installer {
/**
- * NB: this has the suffix '-installer' because in the command line we must distinguish from the '--fixture' flag
- * meaning a particular fixture to be installed.
+ * NB: this has the suffix '-installer' because in the command line we must
+ * distinguish from the '--fixture' flag meaning a particular fixture to be
+ * installed.
*/
static String TYPE = "fixtures-installer";
@@ -41,7 +42,8 @@ public interface FixturesInstaller exten
* {@link LogonFixture}.
*
* <p>
- * If there is more than one {@link LogonFixture}, then the last one installed is returned.
+ * If there is more than one {@link LogonFixture}, then the last one
+ * installed is returned.
*/
LogonFixture getLogonFixture();
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstallerAbstract.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstallerAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstallerAbstract.java Sun Jan 22 07:36:07 2012
@@ -44,7 +44,8 @@ public abstract class FixturesInstallerA
}
/**
- * Add fixtures to {@link FixturesInstallerDelegate#addFixture(Object) delegate}; these are then installed.
+ * Add fixtures to {@link FixturesInstallerDelegate#addFixture(Object)
+ * delegate}; these are then installed.
*/
protected abstract void addFixturesTo(FixturesInstallerDelegate delegate);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstallerDelegate.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstallerDelegate.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstallerDelegate.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixtures/FixturesInstallerDelegate.java Sun Jan 22 07:36:07 2012
@@ -52,7 +52,8 @@ public class FixturesInstallerDelegate {
private final UserProfileService perspectivePersistenceService = new ProfileServiceImpl();
/**
- * Optionally injected in {@link #FixtureBuilderImpl(PersistenceSession) constructor}.
+ * Optionally injected in {@link #FixtureBuilderImpl(PersistenceSession)
+ * constructor}.
*/
private final PersistenceSession persistenceSession;
@@ -60,8 +61,9 @@ public class FixturesInstallerDelegate {
* The requested {@link LogonFixture}, if any.
*
* <p>
- * Each fixture is inspected as it is {@link #installFixture(Object)}; if it implements {@link LogonFixture} then it
- * is remembered so that it can be used later to automatically logon.
+ * Each fixture is inspected as it is {@link #installFixture(Object)}; if it
+ * implements {@link LogonFixture} then it is remembered so that it can be
+ * used later to automatically logon.
*/
private LogonFixture logonFixture;
@@ -70,14 +72,16 @@ public class FixturesInstallerDelegate {
// /////////////////////////////////////////////////////////
/**
- * The {@link PersistenceSession} used will be that from {@link IsisContext#getPersistenceSession() IsisContext}.
+ * The {@link PersistenceSession} used will be that from
+ * {@link IsisContext#getPersistenceSession() IsisContext}.
*/
public FixturesInstallerDelegate() {
this(null);
}
/**
- * For testing, supply own {@link PersistenceSession} rather than lookup from context.
+ * For testing, supply own {@link PersistenceSession} rather than lookup
+ * from context.
*
* @param persistenceSession
*/
@@ -90,7 +94,8 @@ public class FixturesInstallerDelegate {
// /////////////////////////////////////////////////////////
/**
- * Automatically flattens any {@link List}s, recursively (depth-first) if necessary.
+ * Automatically flattens any {@link List}s, recursively (depth-first) if
+ * necessary.
*/
public void addFixture(final Object fixture) {
if (fixture instanceof List) {
@@ -122,11 +127,13 @@ public class FixturesInstallerDelegate {
// /////////////////////////////////////////////////////////
/**
- * Installs all {{@link #addFixture(Object) added fixtures} fixtures (ie as returned by {@link #getFixtures()}).
+ * Installs all {{@link #addFixture(Object) added fixtures} fixtures (ie as
+ * returned by {@link #getFixtures()}).
*
* <p>
- * The set of fixtures (as per {@link #getFixtures()}) is <i>not</i> cleared after installation; this allows the
- * {@link FixtureBuilderAbstract} to be reused across multiple tests.
+ * The set of fixtures (as per {@link #getFixtures()}) is <i>not</i> cleared
+ * after installation; this allows the {@link FixtureBuilderAbstract} to be
+ * reused across multiple tests.
*/
public final void installFixtures() {
preInstallFixtures(getPersistenceSession());
@@ -263,12 +270,15 @@ public class FixturesInstallerDelegate {
// /////////////////////////////////////////////////////////
/**
- * Returns either the {@link IsisContext#getPersistenceSession() singleton } persistor or the persistor
- * {@link #AbstractFixtureBuilder(PersistenceSession) specified by the constructor} if specified.
+ * Returns either the {@link IsisContext#getPersistenceSession() singleton }
+ * persistor or the persistor
+ * {@link #AbstractFixtureBuilder(PersistenceSession) specified by the
+ * constructor} if specified.
*
* <p>
- * Note: if a {@link PersistenceSession persistor} was specified via the constructor, this is not cached (to do so
- * would cause the usage of tests that use the singleton to break).
+ * Note: if a {@link PersistenceSession persistor} was specified via the
+ * constructor, this is not cached (to do so would cause the usage of tests
+ * that use the singleton to break).
*/
private PersistenceSession getPersistenceSession() {
return persistenceSession != null ? persistenceSession : IsisContext.getPersistenceSession();