You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/07/06 13:12:07 UTC
svn commit: r1143343 - in /incubator/isis/trunk/framework: src/docbkx/guide/
viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/
viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/
viewer/wicket/ui/src/...
Author: danhaywood
Date: Wed Jul 6 11:12:07 2011
New Revision: 1143343
URL: http://svn.apache.org/viewvc?rev=1143343&view=rev
Log:
changing remaining USER_ROLE values for Wicket (from org.starobjects.xxx to org.apache.isis.xxx); minor correction in contributors guide
Modified:
incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
Modified: incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml?rev=1143343&r1=1143342&r2=1143343&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml (original)
+++ incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml Wed Jul 6 11:12:07 2011
@@ -4829,7 +4829,7 @@ Please verify the release and cast your
<listitem>
<para>login to <code>people.apache.org</code> using ssh:</para>
- <programlisting>ssh -l xxxxxxxx@people.apache.org</programlisting>
+ <programlisting>ssh -l xxxxxxxx people.apache.org</programlisting>
<para>where xxxxxxx is your apache user Id</para>
</listitem>
Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java?rev=1143343&r1=1143342&r2=1143343&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java Wed Jul 6 11:12:07 2011
@@ -30,7 +30,7 @@ import org.apache.wicket.model.IModel;
/**
* Web page representing an action invocation.
*/
-@AuthorizeInstantiation("org.starobjects.wicket.roles.USER")
+@AuthorizeInstantiation("org.apache.isis.viewer.wicket.roles.USER")
public class ActionPage extends PageAbstract {
/**
Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java?rev=1143343&r1=1143342&r2=1143343&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java Wed Jul 6 11:12:07 2011
@@ -29,7 +29,7 @@ import org.apache.wicket.model.IModel;
/**
* Web page representing the home page (showing a welcome message).
*/
-@AuthorizeInstantiation("org.starobjects.wicket.roles.USER")
+@AuthorizeInstantiation("org.apache.isis.viewer.wicket.roles.USER")
public class HomePage extends PageAbstract {
public HomePage() {
Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java?rev=1143343&r1=1143342&r2=1143343&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java Wed Jul 6 11:12:07 2011
@@ -74,8 +74,7 @@ public class DropDownChoiceComponentFact
* @param underlyingId
* - the id of the {@link Component} created
* @param underlyingModel
- * - the model for the {@link Component}, ie as passed to
- * {@link Components#findComponentFactories(org.starobjects.wicket.viewer.components.ComponentType, IModel)}
+ * - the model for the {@link Component}
*/
public DropDownChoiceComponentFactory(final String id, final Model<ComponentFactory> selectedComponentFactoryModel,
final List<? extends ComponentFactory> componentFactories, final MarkupContainer container,
Modified: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java?rev=1143343&r1=1143342&r2=1143343&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java Wed Jul 6 11:12:07 2011
@@ -48,7 +48,7 @@ public class AuthenticatedWebSessionForI
private static final long serialVersionUID = 1L;
- private static final String USER_ROLE = "org.starobjects.wicket.roles.USER";
+ public static final String USER_ROLE = "org.apache.isis.viewer.wicket.roles.USER";
public static AuthenticatedWebSessionForIsis get() {
return (AuthenticatedWebSessionForIsis) Session.get();