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/12/15 17:12:06 UTC
[1/15] git commit: ISIS-188: more work in prep for trial release
Updated Branches:
refs/heads/master 0e8864843 -> da71950a8
ISIS-188: more work in prep for trial release
- revert tck pom refs in restful, wicket back to 1.0.0-SNAPSHOT
- hide title in wicket sign in page (use logo instead)
- make 'bypass' authentication work with wicket viewer in development mode
- fix scoping of core elements and hsqldb in core pom
- minor tidy up of example quickstart_wicket_restful_jdo
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/da71950a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/da71950a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/da71950a
Branch: refs/heads/master
Commit: da71950a8dcf246e52c2a017ef15d1315cf6f3cf
Parents: a308c89
Author: Dan Haywood <da...@apache.org>
Authored: Sat Dec 15 15:42:19 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Dec 15 15:42:19 2012 +0000
----------------------------------------------------------------------
component/viewer/restfulobjects/tck/pom.xml | 2 +-
component/viewer/wicket/tck/pom.xml | 2 +-
.../wicket/ui/pages/login/WicketSignInPage.css | 4 +++
core/pom.xml | 17 ++++++------
.../authentication/AuthenticatorBypass.java | 8 +----
.../BypassAuthenticationManagerInstaller.java | 5 +--
.../dom/src/main/java/META-INF/persistence.xml | 8 ++++++
.../quickstart_wicket_restful_jdo/pom.xml | 14 +++++-----
.../src/main/java/app/QuickStartApplication.java | 2 +-
.../src/main/resources/app/welcome.html | 20 +-------------
10 files changed, 37 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 1ba0cdb..7db58b3 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index b3b49a1..f80e747 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
index 6477556..fee22a7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
@@ -17,6 +17,10 @@
* under the License.
*/
+
+#header .applicationName {
+ display:none;
+}
.loginPanel {
width:310px;
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1ec1dd9..e1faab7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -931,12 +931,14 @@ ${license.additional-notes}
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<!-- applib -->
@@ -950,6 +952,7 @@ ${license.additional-notes}
<artifactId>isis-core-applib</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<!-- metamodel -->
@@ -963,6 +966,7 @@ ${license.additional-notes}
<artifactId>isis-core-metamodel</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<!-- runtime -->
@@ -979,14 +983,12 @@ ${license.additional-notes}
<scope>test</scope>
</dependency>
- <!-- bytecode-cglib -->
+ <!-- bytecode components -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-cglib</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
-
- <!-- bytecode-javassist -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-javassist</artifactId>
@@ -1005,9 +1007,10 @@ ${license.additional-notes}
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
- <!-- default implementations -->
+ <!-- default implementations of components -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
@@ -1030,13 +1033,11 @@ ${license.additional-notes}
<artifactId>isis-core-tck</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
@@ -1044,6 +1045,7 @@ ${license.additional-notes}
</dependency>
+
<!-- JodaTime -->
<dependency>
<groupId>joda-time</groupId>
@@ -1188,7 +1190,6 @@ ${license.additional-notes}
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.2.9</version>
- <scope>test</scope>
</dependency>
<dependency>
@@ -1269,7 +1270,7 @@ ${license.additional-notes}
</exclusions>
</dependency>
- <!-- Testing libraries (not scope=test because used by viewer/junit) -->
+ <!-- Testing libraries (not scope=test because used by isis-viewer-junit) -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/AuthenticatorBypass.java
----------------------------------------------------------------------
diff --git a/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/AuthenticatorBypass.java b/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/AuthenticatorBypass.java
index bdea7cf..ef38554 100644
--- a/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/AuthenticatorBypass.java
+++ b/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/AuthenticatorBypass.java
@@ -24,8 +24,7 @@ import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
/**
- * Implementation that bypasses authentication (at least, so long as the
- * {@link AuthenticationRequest} is an implementation of {@link AuthenticationRequestNameOnly}).
+ * Implementation that bypasses authentication.
*
* <p>
* Intended for testing use only.
@@ -38,15 +37,12 @@ public class AuthenticatorBypass extends AuthenticatorAbstract {
@Override
public boolean isValid(final AuthenticationRequest request) {
- if(!(request instanceof AuthenticationRequestNameOnly)) {
- return false;
- }
return true;
}
@Override
public boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
- return AuthenticationRequestNameOnly.class.isAssignableFrom(authenticationRequestClass);
+ return true;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/BypassAuthenticationManagerInstaller.java
----------------------------------------------------------------------
diff --git a/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/BypassAuthenticationManagerInstaller.java b/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/BypassAuthenticationManagerInstaller.java
index 3bbf674..554c475 100644
--- a/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/BypassAuthenticationManagerInstaller.java
+++ b/core/security-noop/src/main/java/org/apache/isis/core/security/authentication/BypassAuthenticationManagerInstaller.java
@@ -21,12 +21,11 @@ package org.apache.isis.core.security.authentication;
import java.util.List;
-import com.google.common.collect.Lists;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
import org.apache.isis.core.runtime.authentication.standard.Authenticator;
-import org.apache.isis.core.runtime.system.SystemConstants;
+
+import com.google.common.collect.Lists;
/**
* Run Isis with open access.
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/META-INF/persistence.xml b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/META-INF/persistence.xml
new file mode 100644
index 0000000..1cee366
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/META-INF/persistence.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
+
+ <persistence-unit name="quickstart">
+ </persistence-unit>
+</persistence>
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/example/application/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml
index eefdb93..a331706 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -28,6 +28,13 @@
<name>Quickstart Wicket/Restful/JDO App</name>
<packaging>pom</packaging>
+
+ <properties>
+ <isis.version>1.0.0-SNAPSHOT</isis.version>
+ <isis-objectstore-jdo.version>1.0.0-SNAPSHOT</isis-objectstore-jdo.version>
+ <isis-viewer-wicket.version>1.0.0-SNAPSHOT</isis-viewer-wicket.version>
+ <isis-viewer-restfulobjects.version>1.0.0-SNAPSHOT</isis-viewer-restfulobjects.version>
+ </properties>
<repositories>
<repository>
@@ -148,13 +155,6 @@
<module>viewer-restfulobjects</module>
<module>viewer-wicket</module>
</modules>
-
- <properties>
- <isis.version>1.0.0</isis.version>
- <isis-objectstore-jdo.version>1.0.0</isis-objectstore-jdo.version>
- <isis-viewer-wicket.version>1.0.0</isis-viewer-wicket.version>
- <isis-viewer-restfulobjects.version>1.0.0</isis-viewer-restfulobjects.version>
- </properties>
<dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/QuickStartApplication.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/QuickStartApplication.java b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/QuickStartApplication.java
index d200ab3..c700d77 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/QuickStartApplication.java
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/QuickStartApplication.java
@@ -50,7 +50,7 @@ public class QuickStartApplication extends IsisWicketApplication {
bind(String.class).annotatedWith(Names.named("applicationCss")).toInstance("css/application.css");
bind(String.class).annotatedWith(Names.named("applicationJs")).toInstance("scripts/application.js");
bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines("welcome.html"));
- bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("QuickStart v0.1.0");
+ bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("QuickStart v1.0.0");
}
};
http://git-wip-us.apache.org/repos/asf/isis/blob/da71950a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/app/welcome.html
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/app/welcome.html b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/app/welcome.html
index daccae8..8975fa8 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/app/welcome.html
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/app/welcome.html
@@ -1,25 +1,9 @@
<p class="intro">
-This sample webapp was generated by the Isis QuickStart archetype, configured to use Isis' wicket viewer.
+This is a one-domain application, configured to run with Isis' wicket viewer and the JDO/DataNucleus objectstore.
</p>
<br/>
-<p>
-By default the domain objects are persisted using JDO/DataNucleus objectstore, configured to persist to an in-memory HSQL/DB database.
-</p>
-
-<br/>
-<p>
-To change the JDBC connection string, edit <tt>WEB-INF/persistor_datanucleus.properties</tt>. Also update the <tt>pom.xml</tt> for the appropriate JDBC driver.
-</p>
-
-<br/>
-<p>
-To change the objectstore implementation, edit the <tt>WEB-INF/isis.properties</tt> file.
-</p>
-
<br/>
<p>
-The wicket viewer initially is configured using Wicket's 'development' mode, with Isis' authorization modules are disabled.
-For deployment, typically Wicket viewer should be switched to 'deployment' mode, by editing <tt>WEB-INF/web.xml</tt>.
-Isis' authorization should also be enabled (again, by editing the <tt>WEB-INF/isis.properties</tt> config file).
+For more details, see <a href="http://isis.apache.org/documentation.html">Isis website</a>.
</p>