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/05 09:07:34 UTC
[5/11] ISIS-188: more refactoring of artifacts
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java
----------------------------------------------------------------------
diff --git a/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java
new file mode 100644
index 0000000..1234c00
--- /dev/null
+++ b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.runtime.userprofile;
+
+public interface OptionsClient {
+
+ void loadOptions(Options viewOptions);
+
+ void saveOptions(Options viewOptions);
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java
----------------------------------------------------------------------
diff --git a/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java
new file mode 100644
index 0000000..87c3764
--- /dev/null
+++ b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.runtime.userprofile;
+
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+
+public class PerspectiveEntry {
+
+ public PerspectiveEntry() {
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Name & Title
+ // ///////////////////////////////////////////////////////
+
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ public String getTitle() {
+ return name + " (" + services.size() + " classes)";
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Objects, save
+ // ///////////////////////////////////////////////////////
+
+ private final List<Object> objects = Lists.newArrayList();
+
+ // REVIEW should this deal with Isis, and the services with IDs (or Isis)
+ public List<Object> getObjects() {
+ return objects;
+ }
+
+ public void addToObjects(final Object obj) {
+ if (!objects.contains(obj)) {
+ objects.add(obj);
+ }
+ }
+
+ public void removeFromObjects(final Object obj) {
+ objects.remove(obj);
+ }
+
+ public void save(final List<ObjectAdapter> adapters) {
+ this.objects.clear();
+ for (final ObjectAdapter adapter : adapters) {
+ addToObjects(adapter.getObject());
+ }
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Services
+ // ///////////////////////////////////////////////////////
+
+ private final List<Object> services = Lists.newArrayList();
+
+ public List<Object> getServices() {
+ return services;
+ }
+
+ public void addToServices(final Object service) {
+ if (service != null && !services.contains(service)) {
+ services.add(service);
+ }
+ }
+
+ public void removeFromServices(final Object service) {
+ if (service != null && services.contains(service)) {
+ services.remove(service);
+ }
+ }
+
+ // ///////////////////////////////////////////////////////
+ // copy
+ // ///////////////////////////////////////////////////////
+
+ public void copy(final PerspectiveEntry template) {
+ name = template.getName();
+ for (final Object service : template.getServices()) {
+ addToServices(service);
+ }
+ for (final Object obj : template.getObjects()) {
+ addToObjects(obj);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java
----------------------------------------------------------------------
diff --git a/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java
new file mode 100644
index 0000000..f61c5ce
--- /dev/null
+++ b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.runtime.userprofile;
+
+import java.util.Locale;
+import java.util.TimeZone;
+
+import org.apache.isis.applib.profiles.Localization;
+
+public class UserLocalization implements Localization {
+
+ private final TimeZone timeZone;
+ private final Locale locale;
+
+ public UserLocalization(final Locale locale, final TimeZone timeZone) {
+ this.locale = locale == null ? Locale.getDefault() : locale;
+ this.timeZone = timeZone == null ? TimeZone.getDefault() : timeZone;
+ }
+
+ @Override
+ public Locale getLocale() {
+ return locale;
+ }
+
+ @Override
+ public TimeZone getTimeZone() {
+ return timeZone;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java
----------------------------------------------------------------------
diff --git a/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java
new file mode 100644
index 0000000..b0a755f
--- /dev/null
+++ b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java
@@ -0,0 +1,168 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.runtime.userprofile;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import org.apache.isis.applib.profiles.Localization;
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+
+public class UserProfile implements DebuggableWithTitle {
+
+ public UserProfile() {
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Perspective
+ // ///////////////////////////////////////////////////////
+
+ private PerspectiveEntry entry;
+
+ public PerspectiveEntry getPerspective() {
+ if (entry == null) {
+ if (entries.size() == 0) {
+ throw new IsisException("No perspective in user profile");
+ } else {
+ entry = entries.get(0);
+ }
+ }
+ return entry;
+ }
+
+ public PerspectiveEntry newPerspective(final String name) {
+ entry = new PerspectiveEntry();
+ entry.setName(name);
+ entries.add(entry);
+ return entry;
+ }
+
+ public void removeCurrent() {
+ if (entries.size() > 1) {
+ entries.remove(entry);
+ entry = entries.get(0);
+ }
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Perspective Entries
+ // ///////////////////////////////////////////////////////
+
+ private final List<PerspectiveEntry> entries = Lists.newArrayList();
+
+ public PerspectiveEntry getPerspective(final String name) {
+ for (final PerspectiveEntry entry : entries) {
+ if (entry.getName().equals(name)) {
+ return entry;
+ }
+ }
+ throw new IsisException("No perspective " + name);
+ }
+
+ public void addToPerspectives(final PerspectiveEntry perspective) {
+ final PerspectiveEntry e = new PerspectiveEntry();
+ e.copy(perspective);
+ entries.add(e);
+ }
+
+ public List<String> list() {
+ final List<String> list = Lists.newArrayList();
+ for (final PerspectiveEntry entry : entries) {
+ list.add(entry.getName());
+ }
+ return list;
+ }
+
+ public void select(final String name) {
+ for (final PerspectiveEntry entry : entries) {
+ if (entry.getName().equals(name)) {
+ this.entry = entry;
+ break;
+ }
+ }
+ }
+
+ public void copy(final UserProfile template) {
+ for (final PerspectiveEntry entry : template.entries) {
+ final PerspectiveEntry e = new PerspectiveEntry();
+ e.copy(entry);
+ entries.add(e);
+ }
+ options.copy(template.getOptions());
+ }
+
+ /**
+ * Introduced for debugging.
+ */
+ public List<PerspectiveEntry> getEntries() {
+ return Collections.unmodifiableList(entries);
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Options
+ // ///////////////////////////////////////////////////////
+
+ private final Options options = new Options();
+
+ public Options getOptions() {
+ return options;
+ }
+
+ public void addToOptions(final String name, final String value) {
+ options.addOption(name, value);
+ }
+
+ // ///////////////////////////////
+ // Localization
+ // ///////////////////////////////
+
+ private Localization localization;
+
+ public Localization getLocalization() {
+ return localization;
+ }
+
+ public void setLocalization(final Localization localization) {
+ this.localization = localization;
+ }
+
+ // ///////////////////////////////
+ // Save
+ // ///////////////////////////////
+
+ public void saveObjects(final List<ObjectAdapter> objects) {
+ entry.save(objects);
+ }
+
+ public String debugTitle() {
+ return "User Profle";
+ }
+
+ public void debugData(DebugBuilder debug) {
+ debug.appendln("Localization", localization);
+ debug.appendln("Options", options);
+ debug.appendln("Entry", entry);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java
----------------------------------------------------------------------
diff --git a/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java
new file mode 100644
index 0000000..3b37241
--- /dev/null
+++ b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.runtime.userprofile;
+
+import java.util.List;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+
+/**
+ * Intended to acts like a bridge, loading the profile from the underlying
+ * store.
+ *
+ * <p>
+ * This is an interface only to make it easy to mock in tests. In practice there
+ * is only a single implementation, {@link UserProfileLoaderDefault}.
+ */
+public interface UserProfileLoader extends ApplicationScopedComponent {
+
+ // //////////////////////////////////////////////////////
+ // Fixtures
+ // //////////////////////////////////////////////////////
+
+ /**
+ * @see PersistenceSession#isFixturesInstalled()
+ */
+ public boolean isFixturesInstalled();
+
+ // //////////////////////////////////////////////////////
+ // saveAs...
+ // //////////////////////////////////////////////////////
+
+ public void saveAsDefault(UserProfile userProfile);
+
+ public void saveForUser(String userName, UserProfile userProfile);
+
+ // //////////////////////////////////////////////////////
+ // saveSession
+ // //////////////////////////////////////////////////////
+
+ public void saveSession(List<ObjectAdapter> objects);
+
+ // //////////////////////////////////////////////////////
+ // getProfile
+ // //////////////////////////////////////////////////////
+
+ public UserProfile getProfile(AuthenticationSession session);
+
+ @Deprecated
+ public UserProfile getProfile();
+
+ // //////////////////////////////////////////////////////
+ // Services
+ // //////////////////////////////////////////////////////
+
+ public void setServices(List<Object> servicesList);
+
+ public List<Object> getServices();
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java
----------------------------------------------------------------------
diff --git a/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java
new file mode 100644
index 0000000..0ccc7ea
--- /dev/null
+++ b/framework/core/metamodel/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.runtime.userprofile;
+
+public interface UserProfileStore {
+
+ boolean isFixturesInstalled();
+
+ void save(String userName, UserProfile userProfile);
+
+ UserProfile getUserProfile(String userName);
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/pom.xml
----------------------------------------------------------------------
diff --git a/framework/core/pom.xml b/framework/core/pom.xml
index 635640f..eadd0f4 100644
--- a/framework/core/pom.xml
+++ b/framework/core/pom.xml
@@ -47,11 +47,7 @@
<modules>
<module>testsupport</module>
- <module>commons</module>
<module>metamodel</module>
- <module>progmodel</module>
- <module>runtime</module>
- <module>webapp</module>
</modules>
<build>
@@ -107,19 +103,6 @@
<type>test-jar</type>
</dependency>
- <!-- commons -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>commons</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>commons</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>test-jar</type>
- </dependency>
-
<!-- metamodel -->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -133,45 +116,6 @@
<type>test-jar</type>
</dependency>
- <!-- progmodel -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>test-jar</type>
- </dependency>
-
- <!-- runtime -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>test-jar</type>
- </dependency>
-
- <!-- webapp -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>webapp</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>webapp</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>test-jar</type>
- </dependency>
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/progmodel/NOTICE
----------------------------------------------------------------------
diff --git a/framework/core/progmodel/NOTICE b/framework/core/progmodel/NOTICE
deleted file mode 100644
index d391f54..0000000
--- a/framework/core/progmodel/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Isis
-Copyright 2010-2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/progmodel/pom.xml
----------------------------------------------------------------------
diff --git a/framework/core/progmodel/pom.xml b/framework/core/progmodel/pom.xml
deleted file mode 100644
index dc18c89..0000000
--- a/framework/core/progmodel/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
- <name>Core ProgModel</name>
-
- <properties>
- <siteBaseDir>../..</siteBaseDir>
- <relativeUrl>core/progmodel/</relativeUrl>
- </properties>
-
- <!-- used in Site generation for relative references. -->
- <url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin}</version>
- <inherited>false</inherited>
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- <reportSets>
- <reportSet>
- <inherited>false</inherited>
- <reports>
- <report>dependencies</report>
- <report>dependency-convergence</report>
- <report>plugins</report>
- <report>summary</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencies>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/progmodel/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/framework/core/progmodel/src/site/apt/index.apt b/framework/core/progmodel/src/site/apt/index.apt
deleted file mode 100644
index 22b019f..0000000
--- a/framework/core/progmodel/src/site/apt/index.apt
+++ /dev/null
@@ -1,27 +0,0 @@
-~~ 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.
-
-
-
-
-Documentation
-
- See the {{{../index.html}core}} documentation
- ({{{../docbkx/html/guide/isis-core.html}HTML}} or
- {{{../docbkx/pdf/isis-core.pdf}PDF}}).
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/progmodel/src/site/apt/jottings.apt
----------------------------------------------------------------------
diff --git a/framework/core/progmodel/src/site/apt/jottings.apt b/framework/core/progmodel/src/site/apt/jottings.apt
deleted file mode 100644
index c5d1200..0000000
--- a/framework/core/progmodel/src/site/apt/jottings.apt
+++ /dev/null
@@ -1,24 +0,0 @@
-~~ 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.
-
-
-
-Jottings
-
- This page is to capture any random jottings relating to this module prior
- to being moved into formal documentation.
-
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/progmodel/src/site/site.xml
----------------------------------------------------------------------
diff --git a/framework/core/progmodel/src/site/site.xml b/framework/core/progmodel/src/site/site.xml
deleted file mode 100644
index a8fcc99..0000000
--- a/framework/core/progmodel/src/site/site.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Progmodel" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Programming Model">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Core Modules">
- <item name="Core Test Support" href="../testsupport/index.html" />
- <item name="Core Commons" href="../commons/index.html" />
- <item name="Core Metamodel" href="../metamodel/index.html" />
- <item name="Core Progmodel" href="../progmodel/index.html" />
- <item name="Core Runtime" href="../runtime/index.html" />
- <item name="Core Webapp" href="../webapp/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports"/>
- </body>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
deleted file mode 100644
index aa38e5a..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.about;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import org.apache.isis.core.commons.exceptions.IsisException;
-
-public class AboutIsis {
- private static String applicationCopyrightNotice;
- private static String applicationName;
- private static String applicationVersion;
- private static String frameworkName;
- private static String frameworkVersion;
- private static String logo;
- private static String frameworkCopyright;
- private static String frameworkCompileDate;
- private static List<ComponentDetails> componentDetails;
-
- static {
- try {
- final ResourceBundle bundle = ResourceBundle.getBundle("isis-version");
- logo = bundle.getString("framework.logo");
- frameworkVersion = bundle.getString("framework.version");
- frameworkName = bundle.getString("framework.name");
- frameworkCopyright = bundle.getString("framework.copyright");
- frameworkCompileDate = bundle.getString("framework.compile.date");
- } catch (final MissingResourceException ex) {
- logo = "splash-logo";
- frameworkVersion = "${project.version}-r${buildNumber}";
- frameworkCopyright = "Copyright (c) 2010~2012 Apache Software Foundation";
- frameworkName = "${project.parent.name}";
- }
-
- // NOT in use yet: frameworkVersion = findVersion();
- }
-
- public static String findVersion() {
- try {
- final String moduleId = "org.apache.isis.plugins:dndviewer";
- final String module = moduleId.replace(":", "/");
- final InputStream resourceAsStream = AboutIsis.class.getClassLoader().getResourceAsStream("META-INF/maven/" + module + "/pom.properties");
- if (resourceAsStream == null) {
- return "no version";
- }
- final Properties p = new Properties();
- p.load(resourceAsStream);
- final String version = p.getProperty("version");
- return version;
- } catch (final IOException e) {
- throw new IsisException(e);
- }
-
- }
-
- public static String getApplicationCopyrightNotice() {
- return applicationCopyrightNotice;
- }
-
- public static String getApplicationName() {
- return applicationName;
- }
-
- public static String getApplicationVersion() {
- return applicationVersion;
- }
-
- public static String getFrameworkCopyrightNotice() {
- return select(frameworkCopyright, "Copyright Apache Software Foundation");
- }
-
- public static String getFrameworkCompileDate() {
- return frameworkCompileDate;
- }
-
- public static String getFrameworkName() {
- return select(frameworkName, "Apache Isis (incubating)");
- }
-
- public static String getImageName() {
- return select(logo, "splash-logo");
- }
-
- public static String getFrameworkVersion() {
- final String version = "Version " + select(frameworkVersion, "unreleased");
- /*
- * NOT in use yet: for (ComponentDetails details : componentDetails) {
- * version += "\n" + details.getName() + " " + details.getModule() + " "
- * + details.getVersion(); }
- */
- return version;
- }
-
- public static void main(final String[] args) {
- System.out.println(getFrameworkName() + ", " + getFrameworkVersion());
- System.out.println(getFrameworkCopyrightNotice());
- }
-
- private static String select(final String value, final String defaultValue) {
- return value == null || value.startsWith("${") ? defaultValue : value;
- }
-
- public static void setApplicationCopyrightNotice(final String applicationCopyrightNotice) {
- AboutIsis.applicationCopyrightNotice = applicationCopyrightNotice;
- }
-
- public static void setApplicationName(final String applicationName) {
- AboutIsis.applicationName = applicationName;
- }
-
- public static void setApplicationVersion(final String applicationVersion) {
- AboutIsis.applicationVersion = applicationVersion;
- }
-
- public static void setComponentDetails(final List<ComponentDetails> componentDetails) {
- AboutIsis.componentDetails = componentDetails;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java
deleted file mode 100644
index 6b3d2ea..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.about;
-
-public interface ComponentDetails {
-
- public abstract String getName();
-
- public abstract String getModule();
-
- public abstract String getVersion();
-
- public abstract boolean isInstalled();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
deleted file mode 100644
index ad0c05a..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-
-public interface AuthenticationManager extends ApplicationScopedComponent {
-
- /**
- * Caches and returns an authentication {@link AuthenticationSession} if the
- * {@link AuthenticationRequest request} is valid; otherwise returns
- * <tt>null</tt>.
- */
- AuthenticationSession authenticate(AuthenticationRequest request);
-
- boolean supportsRegistration(Class<? extends RegistrationDetails> registrationDetailsClass);
-
- boolean register(RegistrationDetails registrationDetails);
-
- /**
- * Whether the provided {@link AuthenticationSession} is still valid.
- */
- boolean isSessionValid(AuthenticationSession authenticationSession);
-
- void closeSession(AuthenticationSession authenticationSession);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerInstaller.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerInstaller.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerInstaller.java
deleted file mode 100644
index 08a45ab..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerInstaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication;
-
-import org.apache.isis.core.commons.components.Installer;
-
-public interface AuthenticationManagerInstaller extends Installer {
-
- static String TYPE = "authentication";
-
- AuthenticationManager createAuthenticationManager();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequest.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequest.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequest.java
deleted file mode 100644
index 487629b..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication;
-
-import java.util.List;
-
-public interface AuthenticationRequest {
-
- String getName();
-
- List<String> getRoles();
-
- void setRoles(List<String> roles);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestAbstract.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestAbstract.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestAbstract.java
deleted file mode 100644
index 729dae7..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestAbstract.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-public abstract class AuthenticationRequestAbstract implements AuthenticationRequest {
-
- private final String name;
- private final List<String> roles = Lists.newArrayList();
-
- public AuthenticationRequestAbstract(final String name) {
- this.name = name;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public List<String> getRoles() {
- return Collections.unmodifiableList(roles);
- }
-
- @Override
- public void setRoles(final List<String> roles) {
- this.roles.clear();
- this.roles.addAll(roles);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestPassword.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestPassword.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestPassword.java
deleted file mode 100644
index 636ef21..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestPassword.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication;
-
-public class AuthenticationRequestPassword extends AuthenticationRequestAbstract {
-
- private final String password;
-
- public AuthenticationRequestPassword(final String name, final String password) {
- super(name);
- this.password = password;
- }
-
- public String getPassword() {
- return password;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/RegistrationDetails.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/RegistrationDetails.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/RegistrationDetails.java
deleted file mode 100644
index 23ed0e2..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/RegistrationDetails.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.runtime.authentication;
-
-public interface RegistrationDetails {
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
deleted file mode 100644
index c75dc81..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.core.commons.debug.DebuggableWithTitle;
-import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.runtime.authentication.AuthenticationManager;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.authentication.RegistrationDetails;
-
-public class AuthenticationManagerStandard implements AuthenticationManager, DebuggableWithTitle {
-
- private final Map<String, String> userByValidationCode = Maps.newHashMap();
-
- /**
- * Not final because may be set {@link #setAuthenticators(List)
- * programmatically}.
- */
- private List<Authenticator> authenticators = Lists.newArrayList();
-
- private RandomCodeGenerator randomCodeGenerator;
- private final IsisConfiguration configuration;
-
- // //////////////////////////////////////////////////////////
- // constructor
- // //////////////////////////////////////////////////////////
-
- public AuthenticationManagerStandard(final IsisConfiguration configuration) {
- this.configuration = configuration;
- }
-
- // //////////////////////////////////////////////////////////
- // init
- // //////////////////////////////////////////////////////////
-
- /**
- * Will default the {@link #setRandomCodeGenerator(RandomCodeGenerator)
- * RandomCodeGenerator}, but {@link Authenticator}(s) must have been
- * {@link #addAuthenticator(Authenticator) added} or
- * {@link #setAuthenticators(List) injected}.
- */
- @Override
- public final void init() {
- defaultRandomCodeGeneratorIfNecessary();
- addDefaultAuthenticators();
- if (authenticators.size() == 0) {
- throw new IsisException("No authenticators specified");
- }
- for (final Authenticator authenticator : authenticators) {
- authenticator.init();
- }
- }
-
- private void defaultRandomCodeGeneratorIfNecessary() {
- if (randomCodeGenerator == null) {
- randomCodeGenerator = new RandomCodeGenerator10Chars();
- }
- }
-
- /**
- * optional hook method
- */
- protected void addDefaultAuthenticators() {
- }
-
- @Override
- public void shutdown() {
- for (final Authenticator authenticator : authenticators) {
- authenticator.shutdown();
- }
- }
-
- // //////////////////////////////////////////////////////////
- // Session Management (including authenticate)
- // //////////////////////////////////////////////////////////
-
- @Override
- public synchronized final AuthenticationSession authenticate(final AuthenticationRequest request) {
- if (request == null) {
- return null;
- }
-
- final Collection<Authenticator> compatibleAuthenticators = Collections2.filter(authenticators, AuthenticatorFuncs.compatibleWith(request));
- if (compatibleAuthenticators.size() == 0) {
- throw new NoAuthenticatorException("No authenticator available for processing " + request.getClass().getName());
- }
- for (final Authenticator authenticator : compatibleAuthenticators) {
- final AuthenticationSession authSession = authenticator.authenticate(request, getUnusedRandomCode());
- if (authSession != null) {
- userByValidationCode.put(authSession.getValidationCode(), authSession.getUserName());
- return authSession;
- }
- }
- return null;
- }
-
- private String getUnusedRandomCode() {
- String code;
- do {
- code = randomCodeGenerator.generateRandomCode();
- } while (userByValidationCode.containsKey(code));
-
- return code;
- }
-
- @Override
- public final boolean isSessionValid(final AuthenticationSession session) {
- final String userName = userByValidationCode.get(session.getValidationCode());
- return session.hasUserNameOf(userName);
- }
-
- @Override
- public void closeSession(final AuthenticationSession session) {
- userByValidationCode.remove(session.getValidationCode());
- }
-
- // //////////////////////////////////////////////////////////
- // Authenticators
- // //////////////////////////////////////////////////////////
-
- /**
- * Adds an {@link Authenticator}.
- *
- * <p>
- * Use either this or alternatively {@link #setAuthenticators(List) inject}
- * the full list of {@link Authenticator}s.
- */
- public final void addAuthenticator(final Authenticator authenticator) {
- authenticators.add(authenticator);
- }
-
- /**
- * Adds an {@link Authenticator} to the start of the list (not API).
- */
- protected void addAuthenticatorToStart(final Authenticator authenticator) {
- authenticators.add(0, authenticator);
- }
-
- /**
- * Provide direct injection.
- *
- * <p>
- * Use either this or programmatically
- * {@link #addAuthenticator(Authenticator)}.
- */
- public void setAuthenticators(final List<Authenticator> authenticators) {
- this.authenticators = authenticators;
- }
-
- public List<Authenticator> getAuthenticators() {
- return Collections.unmodifiableList(authenticators);
- }
-
- // //////////////////////////////////////////////////////////
- // register
- // //////////////////////////////////////////////////////////
-
- @Override
- public boolean register(final RegistrationDetails registrationDetails) {
- for (final Registrar registrar : getRegistrars()) {
- if (registrar.canRegister(registrationDetails.getClass())) {
- return registrar.register(registrationDetails);
- }
- }
- return false;
- }
-
- @Override
- public boolean supportsRegistration(final Class<? extends RegistrationDetails> registrationDetailsClass) {
- for (final Registrar registrar : getRegistrars()) {
- if (registrar.canRegister(registrationDetailsClass)) {
- return true;
- }
- }
- return false;
- }
-
- public List<Registrar> getRegistrars() {
- return asAuthenticators(getAuthenticators());
- }
-
- private static List<Registrar> asAuthenticators(final List<Authenticator> authenticators2) {
- final List<Registrar> registrars = Lists.transform(authenticators2, Registrar.AS_REGISTRAR_ELSE_NULL);
- return Lists.newArrayList(Collections2.filter(registrars, Registrar.NON_NULL));
- }
-
- // //////////////////////////////////////////////////////////
- // RandomCodeGenerator
- // //////////////////////////////////////////////////////////
-
- /**
- * The {@link RandomCodeGenerator} in use.
- */
- public RandomCodeGenerator getRandomCodeGenerator() {
- return randomCodeGenerator;
- }
-
- /**
- * For injection; will {@link #defaultRandomCodeGeneratorIfNecessary()
- * default} otherwise.
- */
- public void setRandomCodeGenerator(final RandomCodeGenerator randomCodeGenerator) {
- ensureThatArg(randomCodeGenerator, is(notNullValue()), "randomCodeGenerator cannot be null");
- this.randomCodeGenerator = randomCodeGenerator;
- }
-
- // //////////////////////////////////////////////////////////
- // Debugging
- // //////////////////////////////////////////////////////////
-
- @Override
- public String debugTitle() {
- return "Authentication Manager";
- }
-
- @Override
- public void debugData(final DebugBuilder debug) {
- debug.appendTitle("Authenticators");
- for (final Authenticator authenticator : authenticators) {
- debug.appendln(authenticator.toString());
- }
-
- debug.appendTitle("Users");
- for (final String userName : userByValidationCode.values()) {
- debug.appendln(userName);
- }
- }
-
- @Override
- public String toString() {
- final ToString str = ToString.createAnonymous(this);
- str.append("authenticators", authenticators.size());
- str.append("users", userByValidationCode.size());
- return str.toString();
- }
-
- // //////////////////////////////////////////////////////////
- // Injected (constructor)
- // //////////////////////////////////////////////////////////
-
- protected IsisConfiguration getConfiguration() {
- return configuration;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
deleted file mode 100644
index b62e6f9..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-import java.util.List;
-
-import org.apache.isis.core.commons.config.InstallerAbstract;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationManager;
-import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
-
-public abstract class AuthenticationManagerStandardInstallerAbstract extends InstallerAbstract implements AuthenticationManagerInstaller {
-
- public AuthenticationManagerStandardInstallerAbstract(final String name) {
- super(AuthenticationManagerInstaller.TYPE, name);
- }
-
- @Override
- public final AuthenticationManager createAuthenticationManager() {
- final AuthenticationManagerStandard authenticationManager = createAuthenticationManagerStandard();
- for (final Authenticator authenticator : createAuthenticators(getConfiguration())) {
- authenticationManager.addAuthenticator(authenticator);
- }
- return authenticationManager;
- }
-
- protected AuthenticationManagerStandard createAuthenticationManagerStandard() {
- return new AuthenticationManagerStandard(getConfiguration());
- }
-
- /**
- * Hook method
- *
- * @return
- */
- protected abstract List<Authenticator> createAuthenticators(final IsisConfiguration configuration);
-
- @Override
- public List<Class<?>> getTypes() {
- return listOf(AuthenticationManager.class);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java
deleted file mode 100644
index 20e9741..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-
-public interface Authenticator extends ApplicationScopedComponent {
-
- /**
- * Whether the provided {@link AuthenticationRequest} is recognized by this
- * {@link Authenticator}.
- */
- boolean canAuthenticate(Class<? extends AuthenticationRequest> authenticationRequestClass);
-
- /**
- * Whether this {@link Authenticator} is valid in the running context (and
- * optionally with respect to the provided {@link AuthenticationRequest}).
- *
- * <p>
- * For example, the <tt>ExplorationAuthenticator</tt> (in the default
- * runtime) is only available for authentication if running in
- * <i>exploration mode</i>.
- */
- boolean isValid(AuthenticationRequest request);
-
- /**
- * @param code
- * - a hint; is guaranteed to be unique, but the authenticator
- * decides whether to use it or not.
- */
- AuthenticationSession authenticate(AuthenticationRequest request, String code);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
deleted file mode 100644
index 189d23d..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-
-public abstract class AuthenticatorAbstract implements Authenticator {
-
- private final IsisConfiguration configuration;
-
- // //////////////////////////////////////////////////////
- // constructor
- // //////////////////////////////////////////////////////
-
- public AuthenticatorAbstract(final IsisConfiguration configuration) {
- this.configuration = configuration;
- }
-
- // //////////////////////////////////////////////////////
- // init, shutdown
- // //////////////////////////////////////////////////////
-
- @Override
- public void init() {
- // does nothing.
- }
-
- @Override
- public void shutdown() {
- // does nothing.
- }
-
- // //////////////////////////////////////////////////////
- // API
- // //////////////////////////////////////////////////////
-
- /**
- * Default implementation returns a {@link SimpleSession}; can be overridden
- * if required.
- */
- @Override
- public AuthenticationSession authenticate(final AuthenticationRequest request, final String code) {
- if (!isValid(request)) {
- return null;
- }
- return new SimpleSession(request.getName(), request.getRoles(), code);
- }
-
- // //////////////////////////////////////////////////////
- // Injected (via constructor)
- // //////////////////////////////////////////////////////
-
- public IsisConfiguration getConfiguration() {
- return configuration;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorFuncs.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorFuncs.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorFuncs.java
deleted file mode 100644
index 43ba5d8..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorFuncs.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-import com.google.common.base.Predicate;
-
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-
-public final class AuthenticatorFuncs {
-
- private AuthenticatorFuncs() {
- }
-
- public static Predicate<Authenticator> compatibleWith(final AuthenticationRequest request) {
- return new Predicate<Authenticator>() {
- @Override
- public boolean apply(final Authenticator authenticator) {
- return authenticator.canAuthenticate(request.getClass());
- }
- };
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/NoAuthenticatorException.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/NoAuthenticatorException.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/NoAuthenticatorException.java
deleted file mode 100644
index 6746de8..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/NoAuthenticatorException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-import org.apache.isis.core.commons.exceptions.IsisException;
-
-/**
- * Indicates that there is no Authenticator available to authenticate a user
- * based on this request.
- */
-public class NoAuthenticatorException extends IsisException {
- private static final long serialVersionUID = 1L;
-
- public NoAuthenticatorException() {
- }
-
- public NoAuthenticatorException(final String msg) {
- super(msg);
- }
-
- public NoAuthenticatorException(final String msg, final Throwable cause) {
- super(msg, cause);
- }
-
- public NoAuthenticatorException(final Throwable cause) {
- super(cause);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java
deleted file mode 100644
index d6987dc..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
-
-public abstract class PasswordRequestAuthenticatorAbstract extends AuthenticatorAbstract {
-
- public PasswordRequestAuthenticatorAbstract(final IsisConfiguration configuration) {
- super(configuration);
- }
-
- @Override
- public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
- return AuthenticationRequestPassword.class.isAssignableFrom(authenticationRequestClass);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGenerator.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGenerator.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGenerator.java
deleted file mode 100644
index 1766030..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGenerator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-public interface RandomCodeGenerator {
-
- public String generateRandomCode();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGenerator10Chars.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGenerator10Chars.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGenerator10Chars.java
deleted file mode 100644
index 8f4f992..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGenerator10Chars.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-public class RandomCodeGenerator10Chars implements RandomCodeGenerator {
-
- private static final int NUMBER_CHARACTERS = 10;
- private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-
- @Override
- public String generateRandomCode() {
- final StringBuilder buf = new StringBuilder(NUMBER_CHARACTERS);
- for (int i = 0; i < NUMBER_CHARACTERS; i++) {
- final int pos = (int) ((Math.random() * CHARACTERS.length()));
- buf.append(CHARACTERS.charAt(pos));
- }
- return buf.toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGeneratorUUID.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGeneratorUUID.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGeneratorUUID.java
deleted file mode 100644
index 1882e3b..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RandomCodeGeneratorUUID.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-import java.util.UUID;
-
-public class RandomCodeGeneratorUUID implements RandomCodeGenerator {
-
- /**
- * Generates a random string in the form <tt>XXXX-XX-XX-XX-XXXXXX</tt> where
- * X is a hexadecimal.
- *
- * <p>
- * Implementation uses Java's own {@link UUID} class.
- *
- * @see UUID#toString() for details on the formatting.
- */
- @Override
- public String generateRandomCode() {
- return java.util.UUID.randomUUID().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Registrar.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Registrar.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Registrar.java
deleted file mode 100644
index a6346d5..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Registrar.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.authentication.standard;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.runtime.authentication.RegistrationDetails;
-
-public interface Registrar extends Authenticator, ApplicationScopedComponent {
-
- static Predicate<Registrar> NON_NULL = new Predicate<Registrar>() {
- @Override
- public boolean apply(final Registrar input) {
- return input != null;
- }
- };
-
- static Function<Authenticator, Registrar> AS_REGISTRAR_ELSE_NULL = new Function<Authenticator, Registrar>() {
- @Override
- public Registrar apply(final Authenticator input) {
- if (input instanceof Registrar) {
- return (Registrar) input;
- }
- return null;
- }
- };
-
- /**
- * Whether the provided {@link RegistrationDetails} is recognized by this
- * {@link Registrar}.
- */
- boolean canRegister(Class<? extends RegistrationDetails> registrationDetailsClass);
-
- boolean register(RegistrationDetails registrationDetails);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RegistrationDetailsPassword.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RegistrationDetailsPassword.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RegistrationDetailsPassword.java
deleted file mode 100644
index faa4d98..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/RegistrationDetailsPassword.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.runtime.authentication.standard;
-
-import org.apache.isis.core.runtime.authentication.RegistrationDetails;
-
-public class RegistrationDetailsPassword implements RegistrationDetails {
-
- private final String user;
- private final String password;
-
- public RegistrationDetailsPassword(final String user, final String password) {
- super();
- this.user = user;
- this.password = password;
- }
-
- public String getUser() {
- return user;
- }
-
- public String getPassword() {
- return password;
- }
-
-}