[jboss-cvs] Picketlink SVN: r241 - in console/trunk/picketlink-console/src: main/java/org/picketlink/console/client and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 7 15:53:26 EDT 2010
Author: anil.saldhana at jboss.com
Date: 2010-05-07 15:53:25 -0400 (Fri, 07 May 2010)
New Revision: 241
Added:
console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/TokenProviderObject.java
console/trunk/picketlink-console/src/main/resources/picketlink.css
console/trunk/picketlink-console/src/main/resources/picketlink_banner.png
Removed:
console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/TokenProvider.java
Modified:
console/trunk/picketlink-console/src/main/java/org/picketlink/console/PicketLinkService.gwt.xml
console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/PicketLinkConsoleClient.java
console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/STSConfig.java
console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/modules/TokenProviderTool.java
console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/STSWidget.java
console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/TokenProviderGridWidget.java
console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/TokenProviderWidget.java
console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/TokenProviderService.java
console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/handlers/STSConfigurationHandler.java
console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/handlers/TokenProviderConfigurationHandler.java
console/trunk/picketlink-console/src/main/resources/ErraiService.properties
console/trunk/picketlink-console/src/test/java/org/picketlink/test/console/sts/STSConfigFilePersistUnitTestCase.java
console/trunk/picketlink-console/src/test/java/org/picketlink/test/console/sts/TokenProviderFilePersistUnitTestCase.java
Log:
checkin snapshot
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/PicketLinkService.gwt.xml
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/PicketLinkService.gwt.xml 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/PicketLinkService.gwt.xml 2010-05-07 19:53:25 UTC (rev 241)
@@ -37,6 +37,7 @@
<inherits name="com.google.gwt.user.Debug" />
<set-property name="gwt.enableDebugId" value="true" />
+ <stylesheet src="picketlink.css"/>
<entry-point class='org.picketlink.console.client.PicketLinkConsoleClient'/>
<source path="client" />
</module>
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/PicketLinkConsoleClient.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/PicketLinkConsoleClient.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/PicketLinkConsoleClient.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -32,13 +32,14 @@
import org.jboss.errai.bus.client.api.base.MessageBuilder;
import org.jboss.errai.bus.client.framework.MessageBus;
import org.jboss.errai.workspaces.client.api.annotations.DefaultBundle;
-import org.jboss.errai.workspaces.client.api.annotations.GroupOrder;
+import org.jboss.errai.workspaces.client.api.annotations.GroupOrder;
import org.picketlink.console.client.icons.PicketLinkBundle;
-import org.picketlink.console.client.model.TokenProvider;
+import org.picketlink.console.client.model.TokenProviderObject;
import org.picketlink.console.client.protocol.TokenProviderConfigurationCommands;
import org.picketlink.console.client.protocol.TokenProviderConfigurationParts;
import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.core.client.GWT;
/**
* @author Anil.Saldhana at redhat.com
@@ -52,7 +53,7 @@
private final MessageBus bus = ErraiBus.get();
public static HashMap<String, String[]> serviceProviders = new HashMap<String, String[]>();
- public static Set<TokenProvider> tokenProviders = new HashSet<TokenProvider>();
+ public static Set<TokenProviderObject> tokenProviders = new HashSet<TokenProviderObject>();
public void onModuleLoad()
{
@@ -64,15 +65,15 @@
public static void removeTokenProvider( String providerClass )
{
int size = tokenProviders.size();
- TokenProvider removeThisTokenProvider = null;
+ TokenProviderObject removeThisTokenProvider = null;
if( size > 0 )
{
Iterator iter = tokenProviders.iterator();
while( iter.hasNext() )
{
- TokenProvider tp = (TokenProvider) iter.next();
- if( providerClass.equals( tp.getProvider() ))
+ TokenProviderObject tp = (TokenProviderObject) iter.next();
+ if( providerClass.equals( tp.getProviderClass()))
{
removeThisTokenProvider = tp;
break;
@@ -85,16 +86,16 @@
}
}
- public static TokenProvider getTokenProvider( String providerClass )
+ public static TokenProviderObject getTokenProvider( String providerClass )
{
int size = tokenProviders.size();
if( size > 0 )
{
- Iterator<TokenProvider> iter = tokenProviders.iterator();
+ Iterator<TokenProviderObject> iter = tokenProviders.iterator();
while( iter.hasNext() )
{
- TokenProvider tp = iter.next();
- if( providerClass.equals( tp.getProvider() ))
+ TokenProviderObject tp = iter.next();
+ if( providerClass.equals( tp.getProviderClass() ))
{
return tp;
}
@@ -118,11 +119,11 @@
Iterator iter = tokenProvidersSet.iterator();
while( iter != null && iter.hasNext() )
{
- TokenProvider tokenProvider = (TokenProvider) iter.next();
+ TokenProviderObject tokenProvider = ( TokenProviderObject ) iter.next();
PicketLinkConsoleClient.tokenProviders.add(tokenProvider);
}
}
- });
+ });
MessageBuilder.createMessage()
.toSubject("TokenProviderService")
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/STSConfig.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/STSConfig.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/STSConfig.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -54,8 +54,9 @@
private String signingKeyAlias;
private String signingKeyPass;
+
- private Set<TokenProvider> tokenProviders = new HashSet<TokenProvider>();
+ private Set<TokenProviderObject> tokenProviders = new HashSet<TokenProviderObject>();
public String getStsName()
{
@@ -137,12 +138,12 @@
this.signingKeyPass = signingKeyPass;
}
- public Set<TokenProvider> getTokenProviders()
+ public Set<TokenProviderObject> getTokenProviders()
{
return tokenProviders;
}
- public void setTokenProviders(Set<TokenProvider> tokenProviders)
+ public void setTokenProviders(Set<TokenProviderObject> tokenProviders)
{
this.tokenProviders = tokenProviders;
}
@@ -160,15 +161,17 @@
builder.append( ": signing key alias =" + getSigningKeyAlias() );
builder.append( ": signing key pass=" + getSigningKeyPass() );
- Set<TokenProvider> tokenProviders = getTokenProviders();
- Iterator<TokenProvider> iter = tokenProviders.iterator();
+ Set<TokenProviderObject> tokenProviders = getTokenProviders();
+ Iterator<TokenProviderObject> iter = tokenProviders.iterator();
builder.append( "[ Token Providers=[");
while( iter != null && iter.hasNext() )
{
- TokenProvider tokenProvider = iter.next();
+ TokenProviderObject tokenProvider = iter.next();
builder.append( tokenProvider.toString() );
}
- builder.append( "]" );
+ builder.append( "]" );
+
+
System.out.println( builder.toString() );
return super.toString();
}
Deleted: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/TokenProvider.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/TokenProvider.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/TokenProvider.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.console.client.model;
-
-import java.io.Serializable;
-
-import org.jboss.errai.bus.server.annotations.ExposeEntity;
-
-/**
- * Represents configuration about a Token Provider
- * @author Anil.Saldhana at redhat.com
- * @since Apr 30, 2010
- */
- at ExposeEntity
-public class TokenProvider implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- private String provider = null;
-
- private String tokenType = null;
-
- public String getProvider()
- {
- return provider;
- }
-
- public void setProvider(String providerClass)
- {
- this.provider = providerClass;
- }
-
- public String getTokenType()
- {
- return tokenType;
- }
-
- public void setTokenType(String tokenType)
- {
- this.tokenType = tokenType;
- }
-
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- TokenProvider other = (TokenProvider) obj;
- if (provider == null)
- {
- if (other.provider != null)
- return false;
- }
- else if (!provider.equals(other.provider))
- return false;
- if (tokenType == null)
- {
- if (other.tokenType != null)
- return false;
- }
- else if (!tokenType.equals(other.tokenType))
- return false;
- return true;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((provider == null) ? 0 : provider.hashCode());
- result = prime * result + ((tokenType == null) ? 0 : tokenType.hashCode());
- return result;
- }
-
- @Override
- public String toString()
- {
- StringBuilder builder = new StringBuilder( "TokenProvider:");
- builder.append( "ProviderClassname=").append( provider );
- builder.append( ":TokenType=").append( tokenType );
- builder.append( "]" );
- return builder.toString();
- }
-}
\ No newline at end of file
Added: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/TokenProviderObject.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/TokenProviderObject.java (rev 0)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/model/TokenProviderObject.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.console.client.model;
+
+import java.io.Serializable;
+
+import org.jboss.errai.bus.server.annotations.ExposeEntity;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since May 5, 2010
+ */
+ at SuppressWarnings("serial")
+ at ExposeEntity
+public class TokenProviderObject implements Serializable
+{
+ private String providerClass;
+
+ private String tokenType;
+
+ public String getProviderClass()
+ {
+ return providerClass;
+ }
+
+ public void setProviderClass(String providerClass)
+ {
+ this.providerClass = providerClass;
+ }
+
+ public String getTokenType()
+ {
+ return tokenType;
+ }
+
+ public void setTokenType(String tokenType)
+ {
+ this.tokenType = tokenType;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((providerClass == null) ? 0 : providerClass.hashCode());
+ result = prime * result + ((tokenType == null) ? 0 : tokenType.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ TokenProviderObject other = (TokenProviderObject) obj;
+ if (providerClass == null)
+ {
+ if (other.providerClass != null)
+ return false;
+ }
+ else if (!providerClass.equals(other.providerClass))
+ return false;
+ if (tokenType == null)
+ {
+ if (other.tokenType != null)
+ return false;
+ }
+ else if (!tokenType.equals(other.tokenType))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "TokenProviderObject [providerClass=" + providerClass + ", tokenType=" + tokenType + "]";
+ }
+}
\ No newline at end of file
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/modules/TokenProviderTool.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/modules/TokenProviderTool.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/modules/TokenProviderTool.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -26,7 +26,6 @@
import org.jboss.errai.workspaces.client.api.WidgetProvider;
import org.jboss.errai.workspaces.client.api.annotations.LoadTool;
import org.picketlink.console.client.widgets.TokenProviderGridWidget;
-import org.picketlink.console.client.widgets.TokenProviderWidget;
import com.google.gwt.user.client.ui.Widget;
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/STSWidget.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/STSWidget.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/STSWidget.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -35,7 +35,7 @@
import org.jboss.errai.widgets.client.mapping.ErraiWidgetBinding;
import org.picketlink.console.client.PicketLinkConsoleClient;
import org.picketlink.console.client.model.STSConfig;
-import org.picketlink.console.client.model.TokenProvider;
+import org.picketlink.console.client.model.TokenProviderObject;
import org.picketlink.console.client.protocol.STSConfigurationCommands;
import org.picketlink.console.client.protocol.STSConfigurationParts;
@@ -122,11 +122,11 @@
widgets.add( new Label( "Token Providers:" ));
final ListBox tokenProviderListBox = new ListBox( true );
- Iterator<TokenProvider> iter = PicketLinkConsoleClient.tokenProviders.iterator();
+ Iterator<TokenProviderObject> iter = PicketLinkConsoleClient.tokenProviders.iterator();
while( iter.hasNext() )
{
- TokenProvider tokenProvider = iter.next();
- tokenProviderListBox.addItem( tokenProvider.getProvider() );
+ TokenProviderObject tokenProvider = iter.next();
+ tokenProviderListBox.addItem( tokenProvider.getProviderClass() );
}
widgets.add( tokenProviderListBox );
@@ -156,7 +156,7 @@
{
String providerClassName = tokenProviderListBox.getItemText(i);
- TokenProvider tokenProvider = PicketLinkConsoleClient.getTokenProvider(providerClassName);
+ TokenProviderObject tokenProvider = PicketLinkConsoleClient.getTokenProvider(providerClassName);
stsConfig.getTokenProviders().add(tokenProvider);
}
}
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/TokenProviderGridWidget.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/TokenProviderGridWidget.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/TokenProviderGridWidget.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -39,7 +39,7 @@
import org.jboss.errai.widgets.client.format.WSCellSimpleTextCell;
import org.jboss.errai.widgets.client.icons.ErraiWidgetsImageBundle;
import org.picketlink.console.client.PicketLinkConsoleClient;
-import org.picketlink.console.client.model.TokenProvider;
+import org.picketlink.console.client.model.TokenProviderObject;
import org.picketlink.console.client.protocol.TokenProviderConfigurationCommands;
import org.picketlink.console.client.protocol.TokenProviderConfigurationParts;
@@ -80,7 +80,7 @@
Iterator iter = tokenProvidersSet.iterator();
while( iter != null && iter.hasNext() )
{
- TokenProvider tokenProvider = (TokenProvider) iter.next();
+ TokenProviderObject tokenProvider = (TokenProviderObject) iter.next();
PicketLinkConsoleClient.tokenProviders.add(tokenProvider);
}
@@ -208,11 +208,11 @@
{
int index = 0;
- Iterator<TokenProvider> tokenProviders = PicketLinkConsoleClient.tokenProviders.iterator();
+ Iterator<TokenProviderObject> tokenProviders = PicketLinkConsoleClient.tokenProviders.iterator();
while(tokenProviders.hasNext() )
{
- TokenProvider tokenProvider = tokenProviders.next();
- wsGrid.setCell(index, 0, new WSCellSimpleTextCell( tokenProvider.getProvider() , true));
+ TokenProviderObject tokenProvider = tokenProviders.next();
+ wsGrid.setCell(index, 0, new WSCellSimpleTextCell( tokenProvider.getProviderClass() , true));
wsGrid.setCell(index, 1, tokenProvider.getTokenType());
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/TokenProviderWidget.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/TokenProviderWidget.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/TokenProviderWidget.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -24,6 +24,7 @@
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
import org.jboss.errai.bus.client.ErraiBus;
+import org.jboss.errai.bus.client.api.ErrorCallback;
import org.jboss.errai.bus.client.api.Message;
import org.jboss.errai.bus.client.api.MessageCallback;
import org.jboss.errai.bus.client.api.base.MessageBuilder;
@@ -31,7 +32,7 @@
import org.jboss.errai.common.client.framework.AcceptsCallback;
import org.jboss.errai.widgets.client.WSModalDialog;
import org.jboss.errai.widgets.client.mapping.ErraiWidgetBinding;
-import org.picketlink.console.client.model.TokenProvider;
+import org.picketlink.console.client.model.TokenProviderObject;
import org.picketlink.console.client.protocol.TokenProviderConfigurationCommands;
import org.picketlink.console.client.protocol.TokenProviderConfigurationParts;
@@ -107,7 +108,7 @@
Window.alert( "Token Type is empty" );
return;
}
- final TokenProvider tokenProvider = constructObject( providerClassText, tokenTypeText );
+ final TokenProviderObject tokenProvider = constructObject( providerClassText, tokenTypeText );
if( tokenProvider == null )
return;
@@ -124,7 +125,14 @@
.toSubject("TokenProviderService")
.command( TokenProviderConfigurationCommands.TOKEN_ADD )
.with( TokenProviderConfigurationParts.TokenProviderObj, tokenProvider )
- .noErrorHandling().sendNowWith(bus);
+ .with( TokenProviderConfigurationParts.ProviderClass, providerClassText)
+ .errorsHandledBy( new ErrorCallback()
+ {
+ public boolean error(Message message, Throwable throwable)
+ {
+ throw new RuntimeException( throwable.getLocalizedMessage() );
+ }
+ }).sendNowWith(bus);
confirmSubmit.hide(); //Hide the modal window
@@ -159,10 +167,10 @@
this.add( widgets );
}
- private TokenProvider constructObject( String providerClass, String tokenType )
+ private TokenProviderObject constructObject( String providerClass, String tokenType )
{
- TokenProvider tokenProvider = new TokenProvider();
- tokenProvider.setProvider( providerClass );
+ TokenProviderObject tokenProvider = new TokenProviderObject();
+ tokenProvider.setProviderClass( providerClass );
tokenProvider.setTokenType(tokenType);
return tokenProvider;
}
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/TokenProviderService.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/TokenProviderService.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/TokenProviderService.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -32,7 +32,7 @@
import org.jboss.errai.bus.server.annotations.Service;
import org.jboss.errai.bus.server.annotations.security.RequireRoles;
import org.jboss.logging.Logger;
-import org.picketlink.console.client.model.TokenProvider;
+import org.picketlink.console.client.model.TokenProviderObject;
import org.picketlink.console.client.protocol.TokenProviderConfigurationCommands;
import org.picketlink.console.client.protocol.TokenProviderConfigurationParts;
import org.picketlink.console.server.handlers.TokenProviderConfigurationHandler;
@@ -73,7 +73,10 @@
switch( TokenProviderConfigurationCommands.valueOf( commandType ) )
{
case TOKEN_ADD:
- TokenProvider tokenProvider = message.get( TokenProvider.class , TokenProviderConfigurationParts.TokenProviderObj );
+ TokenProviderObject tokenProvider = message.get( TokenProviderObject.class , TokenProviderConfigurationParts.TokenProviderObj );
+ String providerClass = message.get(String.class, TokenProviderConfigurationParts.ProviderClass );
+ tokenProvider.setProviderClass(providerClass);
+
trace( tokenProvider );
try
{
@@ -89,8 +92,8 @@
break;
case TOKEN_DELETE:
- String providerClass = message.get( String.class, TokenProviderConfigurationParts.ProviderClass );
- Set<TokenProvider> tokenProviderSet;
+ providerClass = message.get( String.class, TokenProviderConfigurationParts.ProviderClass );
+ Set<TokenProviderObject> tokenProviderSet;
try
{
tokenProviderSet = handler.getTokenProviders();
@@ -101,14 +104,14 @@
return;
}
- Iterator<TokenProvider> iter = tokenProviderSet.iterator();
+ Iterator<TokenProviderObject> iter = tokenProviderSet.iterator();
- TokenProvider removeThisTokenProvider = null;
+ TokenProviderObject removeThisTokenProvider = null;
while( iter.hasNext() )
{
- TokenProvider tp = iter.next();
- if( tp.getProvider().equals( providerClass ))
+ TokenProviderObject tp = iter.next();
+ if( tp.getProviderClass().equals( providerClass ))
{
removeThisTokenProvider = tp;
break;
@@ -129,7 +132,7 @@
break;
case TOKEN_UPDATE:
- tokenProvider = message.get( TokenProvider.class , TokenProviderConfigurationParts.TokenProviderObj );
+ tokenProvider = message.get( TokenProviderObject.class , TokenProviderConfigurationParts.TokenProviderObj );
trace( tokenProvider );
try
{
@@ -144,7 +147,7 @@
break;
case TOKEN_LIST:
- tokenProviderSet = new HashSet<TokenProvider>();
+ tokenProviderSet = new HashSet<TokenProviderObject>();
try
{
tokenProviderSet = handler.getTokenProviders();
@@ -176,10 +179,10 @@
.noErrorHandling().sendNowWith( bus );
}
- private void trace( TokenProvider tokenProvider )
+ private void trace( TokenProviderObject tokenProvider )
{
StringBuilder builder = new StringBuilder();
- builder.append("ProviderClass:" + tokenProvider.getProvider() );
+ builder.append("ProviderClass:" + tokenProvider.getProviderClass() );
builder.append(": Token Type=" + tokenProvider.getTokenType() );
System.out.println( builder.toString() );
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/handlers/STSConfigurationHandler.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/handlers/STSConfigurationHandler.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/handlers/STSConfigurationHandler.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -32,7 +32,7 @@
import javax.xml.bind.JAXBException;
import org.picketlink.console.client.model.STSConfig;
-import org.picketlink.console.client.model.TokenProvider;
+import org.picketlink.console.client.model.TokenProviderObject;
import org.picketlink.identity.federation.core.config.AuthPropertyType;
import org.picketlink.identity.federation.core.config.KeyProviderType;
import org.picketlink.identity.federation.core.config.ObjectFactory;
@@ -132,19 +132,19 @@
stsType.setKeyProvider( keyProviderType );
- Set<TokenProvider> tokenProviders = stsConfig.getTokenProviders();
+ Set<TokenProviderObject> tokenProviders = stsConfig.getTokenProviders();
if( tokenProviders != null )
{
TokenProvidersType tokenProvidersType = objectFactory.createTokenProvidersType();
stsType.setTokenProviders( tokenProvidersType );
- Iterator<TokenProvider> iterator = tokenProviders.iterator();
+ Iterator<TokenProviderObject> iterator = tokenProviders.iterator();
while( iterator.hasNext() )
{
- TokenProvider tokenProvider = iterator.next();
+ TokenProviderObject tokenProvider = iterator.next();
TokenProviderType tokenProviderType = objectFactory.createTokenProviderType();
- tokenProviderType.setProviderClass( tokenProvider.getProvider() );
+ tokenProviderType.setProviderClass( tokenProvider.getProviderClass() );
tokenProviderType.setTokenType( tokenProvider.getTokenType() );
tokenProvidersType.getTokenProvider().add( tokenProviderType );
Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/handlers/TokenProviderConfigurationHandler.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/handlers/TokenProviderConfigurationHandler.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/handlers/TokenProviderConfigurationHandler.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -33,7 +33,7 @@
import javax.xml.bind.JAXBException;
-import org.picketlink.console.client.model.TokenProvider;
+import org.picketlink.console.client.model.TokenProviderObject;
import org.picketlink.identity.federation.core.config.AuthPropertyType;
import org.picketlink.identity.federation.core.config.KeyProviderType;
import org.picketlink.identity.federation.core.config.ObjectFactory;
@@ -86,9 +86,9 @@
* @throws FileNotFoundException
* @throws JAXBException
*/
- public Set<TokenProvider> getTokenProviders() throws FileNotFoundException, JAXBException
+ public Set<TokenProviderObject> getTokenProviders() throws FileNotFoundException, JAXBException
{
- Set<TokenProvider> tokenProvidersSet = new HashSet<TokenProvider>();
+ Set<TokenProviderObject> tokenProvidersSet = new HashSet<TokenProviderObject>();
File tool_xml = getXMLFileInstance();
if(tool_xml.exists() )
@@ -112,7 +112,7 @@
* @throws FileNotFoundException
* @throws JAXBException
*/
- public void remove( TokenProvider tokenProvider ) throws FileNotFoundException, JAXBException
+ public void remove( TokenProviderObject tokenProvider ) throws FileNotFoundException, JAXBException
{
TokenProviderType tokenProviderType = getTokenProviderType(tokenProvider);
@@ -143,7 +143,7 @@
* @throws FileNotFoundException
* @throws JAXBException
*/
- public void persist( TokenProvider tokenProvider ) throws FileNotFoundException, JAXBException
+ public void persist( TokenProviderObject tokenProvider ) throws FileNotFoundException, JAXBException
{
TokenProviderType tokenProviderType = getTokenProviderType(tokenProvider);
@@ -178,24 +178,24 @@
return new File( toolXMLPath.toString() );
}
- private TokenProvider map( TokenProviderType tokenProviderType )
+ private TokenProviderObject map( TokenProviderType tokenProviderType )
{
- TokenProvider tokenProvider = new TokenProvider();
- tokenProvider.setProvider( tokenProviderType.getProviderClass() );
+ TokenProviderObject tokenProvider = new TokenProviderObject();
+ tokenProvider.setProviderClass( tokenProviderType.getProviderClass() );
tokenProvider.setTokenType( tokenProviderType.getTokenType() );
return tokenProvider;
}
- private TokenProviderType getTokenProviderType( TokenProvider tokenProvider )
+ private TokenProviderType getTokenProviderType( TokenProviderObject tokenProvider )
{
ObjectFactory objectFactory = new ObjectFactory();
TokenProviderType tokenProviderType = objectFactory.createTokenProviderType();
- tokenProviderType.setProviderClass( tokenProvider.getProvider() );
+ tokenProviderType.setProviderClass( tokenProvider.getProviderClass() );
tokenProviderType.setTokenType( tokenProvider.getTokenType() );
return tokenProviderType;
}
- private STSType mapSTSConfiguration( TokenProvider tokenProvider )
+ private STSType mapSTSConfiguration( TokenProviderObject tokenProvider )
{
ObjectFactory objectFactory = new ObjectFactory();
STSType stsType = objectFactory.createSTSType();
@@ -237,7 +237,7 @@
stsType.setTokenProviders( tokenProvidersType );
TokenProviderType tokenProviderType = objectFactory.createTokenProviderType();
- tokenProviderType.setProviderClass( tokenProvider.getProvider() );
+ tokenProviderType.setProviderClass( tokenProvider.getProviderClass() );
tokenProviderType.setTokenType( tokenProvider.getTokenType() );
tokenProvidersType.getTokenProvider().add( tokenProviderType );
Modified: console/trunk/picketlink-console/src/main/resources/ErraiService.properties
===================================================================
--- console/trunk/picketlink-console/src/main/resources/ErraiService.properties 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/main/resources/ErraiService.properties 2010-05-07 19:53:25 UTC (rev 241)
@@ -20,6 +20,7 @@
#
#errai.application_context=/PicketLinkService/
errai.dispatcher_implementation=org.jboss.errai.bus.server.AsyncDispatcher
+
#
# Specify the Authentication/Authorization Adapter sendNowWith use
#
@@ -35,4 +36,4 @@
#
# (Optional) A Login MOTD sendNowWith be sent sendNowWith the client upon successful login.
#
-errai.login_motd=UNAUTHORIZED ACCESS IS PROHIBITED!
\ No newline at end of file
+errai.login_motd=UNAUTHORIZED ACCESS IS PROHIBITED!
Added: console/trunk/picketlink-console/src/main/resources/picketlink.css
===================================================================
--- console/trunk/picketlink-console/src/main/resources/picketlink.css (rev 0)
+++ console/trunk/picketlink-console/src/main/resources/picketlink.css 2010-05-07 19:53:25 UTC (rev 241)
@@ -0,0 +1,845 @@
+body {
+ height: 100%;
+ overflow: hidden;
+ margin: 0;
+ padding: 0;
+ background:#edf0f4 url(picketlink_banner.png) repeat-x;
+}
+
+WSLogin {
+ background: #edf0f4;
+}
+
+.WSLoadInitPanel {
+ background:yellow;
+ cursor: wait;
+ position: absolute; top: 0; left: 0;
+ z-index:1000;
+}
+
+.WSGrid-header {
+ border-collapse: collapse;
+ border-spacing: 0;
+ height: 20px;
+
+ padding:0;
+ margin:0;
+
+ background-image: url("images/ui/layout/column-header.png");
+
+ border-top: 1px solid #EFEFEF;
+ border-bottom: 1px solid #BABABA;
+}
+
+.WSGrid-header td {
+ font-weight: bold;
+ font-size: 9px;
+ margin: 0;
+ padding: 0;
+ height: 18px;
+}
+
+.WSGrid {
+ border-collapse: collapse;
+ border-spacing: 0;
+ border-left: #EDEDED;
+ border-right: #EAEAEA;
+}
+
+.WSGrid td {
+ padding: 0;
+}
+
+.WSGrid-datagrid {
+ padding:0;
+ margin:0;
+}
+
+.WSCell {
+ height: 16px;
+ min-height: 16px;
+
+ margin: 0;
+ font-size: 11px;
+
+ cursor: default;
+
+ padding: 1px;
+ border: 1px solid transparent;
+ border-bottom-color: #efefef;
+ border-left-color: #efefef;
+
+ vertical-align: middle;
+
+ overflow: hidden;
+}
+
+.WSCell-inner {
+ vertical-align: middle;
+}
+
+.WSCell-panel {
+ overflow: auto;
+ height: 12pt;
+ vertical-align: middle;
+}
+
+.WSCell-innerpanel {
+ /**
+ * This is needed to fix a Firefox rendering bug.
+ */
+ overflow: auto;
+ vertical-align: middle;
+
+}
+
+.WSCell-hover {
+ background-color: #eeeeff;
+}
+
+.WSCell-selected {
+ background-color: #ddddff;
+ color: black;
+ border: 1px solid lightsteelblue;
+}
+
+.WSCell-click {
+ background-color: #ddddff;
+}
+
+.WSCell-colselect {
+ background-color: #ddddff;
+ border: 1px solid #ddddff;
+
+ border-bottom-color: lightgray;
+ border-right-color: lightsteelblue;
+ border-left-color: lightsteelblue;
+}
+
+.WSCell-hcolselect {
+ background-color: #aaaaff;
+ border: 1px solid #aaaaff;
+}
+
+.WSCell-rowselect-left {
+ border-top: 1px solid lightsteelblue;
+ border-bottom: 1px solid lightsteelblue;
+ border-left: 1px solid lightsteelblue;
+ background-color: #ddddff;
+}
+
+.WSCell-rowselect-right {
+ border-top: 1px solid lightsteelblue;
+ border-bottom: 1px solid lightsteelblue;
+ border-right: 1px solid lightsteelblue;
+ background-color: #ddddff;
+
+}
+
+.WSCell-rowselect {
+ border-top: 1px solid lightsteelblue;
+ border-bottom: 1px solid lightsteelblue;
+ background-color: #ddddff;
+}
+
+.WSCell-editbox {
+ border: 2px cornflowerblue solid;
+ font-size: 11px;
+ width: 100%;
+ overflow: auto;
+ position: absolute;
+}
+
+.WSCell-resize-right {
+ cursor: e-resize;
+}
+
+.WSCell-resize-left {
+ cursor: w-resize;
+}
+
+.WSGrid-resize-line {
+ border-left: 1px solid lightblue;
+ height: 100%;
+}
+
+
+.WSWindowPanel {
+ background: white;
+ border: 1px solid #cecece;
+}
+
+.WSWindowPanel-titlearea {
+ background: url("images/ui/layout/section-header.png") repeat-x;
+ vertical-align: middle;
+ font-size: 10px;
+ font-weight: bold;
+
+ padding: 1px;
+
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ user-select: none;
+}
+
+.WSWindowPanel-drape {
+ width: 100%;
+ height: 100%;
+ background: black;
+ opacity: 0.2;
+ filter: alpha(opacity = 20);
+}
+
+.WSDropShadow-topLeftCorner {
+ width: 17px;
+ height: 17px;
+ background: url("images/ui/layout/dropshadow/eq-topleft.png") no-repeat;
+}
+
+.WSDropShadow-topLeft {
+ height: 17px;
+ width: 13px;
+ background: url("images/ui/layout/dropshadow/eq-topleft-inner.png")
+}
+
+.WSDropShadow-topMiddle {
+ height: 17px;
+ width: 100%;
+ background: url("images/ui/layout/dropshadow/eq-top.png");
+}
+
+.WSDropShadow-topRight {
+ width: 13px;
+ height: 17px;
+ background: url("images/ui/layout/dropshadow/eq-topright-inner.png") transparent;
+}
+
+.WSDropShadow-topRightCorner {
+ width: 17px;
+ height: 17px;
+ background: url("images/ui/layout/dropshadow/eq-topright.png") no-repeat;
+}
+
+.WSDropShadow-leftTop {
+ width: 17px;
+ height: 11px;
+ background: url("images/ui/layout/dropshadow/eq-lefttop.png") no-repeat;
+}
+
+.WSDropShadow-leftMiddle {
+ height: 100%;
+ width: 17px;
+ background: url("images/ui/layout/dropshadow/eq-left.png") repeat-y;
+}
+
+.WSDropShadow-leftBottom {
+ height: 11px;
+ width: 17px;
+ background: url("images/ui/layout/dropshadow/eq-leftbottom.png") no-repeat;
+}
+
+.WSDropShadow-rightTop {
+ height: 11px;
+ width: 17px;
+ background: url("images/ui/layout/dropshadow/eq-righttop.png") no-repeat;
+}
+
+.WSDropShadow-rightMiddle {
+ height: 100%;
+ width: 17px;
+ background: url("images/ui/layout/dropshadow/eq-right.png") repeat-y;
+}
+
+.WSDropShadow-rightBottom {
+ height: 11px;
+ width: 17px;
+ background: url("images/ui/layout/dropshadow/eq-rightbottom.png") no-repeat transparent;
+}
+
+.WSDropShadow-bottomLeftCorner {
+ height: 17px;
+ width: 17px;
+ background: url("images/ui/layout/dropshadow/eq-bottomleft.png") no-repeat;
+}
+
+.WSDropShadow-bottomLeft {
+ height: 17px;
+ width: 13px;
+ background: url("images/ui/layout/dropshadow/eq-bottomleft-inner.png") no-repeat;
+}
+
+.WSDropShadow-bottomMiddle {
+ height: 17px;
+ width: 100%;
+ background: url("images/ui/layout/dropshadow/eq-bottom.png") repeat-x;
+}
+
+.WSDropShadow-bottomRight {
+ height: 17px;
+ width: 13px;
+ background: url("images/ui/layout/dropshadow/eq-bottomright-inner.png") no-repeat;
+}
+
+.WSDropShadow-bottomRightCorner {
+ height: 17px;
+ width: 17px;
+ background: url("images/ui/layout/dropshadow/eq-bottomright.png") no-repeat;
+}
+
+
+.WSLaunchButton {
+ height: 20px;
+ vertical-align: middle;
+ font-size: 11px;
+ margin: 0;
+ color: black;
+ cursor: default;
+ padding-left:10px;
+}
+
+.WSLaunchButton-hover {
+ height: 20px;
+ cursor: hand;
+}
+
+.WSLaunchButton-contents {
+ display: inline-block;
+ vertical-align: top;
+ line-height: 20px;
+ margin: 0;
+ padding: 0;
+}
+
+.WSLaunchButton-down {
+ color: black;
+ cursor: default;
+ height: 20px;
+ font-size: 11px;
+ margin: 0;
+}
+
+/*** mosaic overrides ***/
+
+
+.mosaic-Label {
+ font-weight:bold;
+}
+
+.gwt-Button {
+ font-size: 10px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+}
+
+
+/*** tab bar ***/
+
+
+.gwt-TabPanelBottom {
+ border-left: 1px solid #bcbcbc;
+ border-right: 1px solid #bcbcbc;
+ border-bottom: 1px solid #bcbcbc;
+ border-top: 0px solid #ffffff;
+ overflow: hidden;
+ padding: 5px;
+ background:#ffffff;
+}
+
+/*** decorated tabs ***/
+
+.gwt-DecoratedTabBar {
+}
+.gwt-DecoratedTabBar .gwt-TabBarFirst {
+ width: 5px; /* first tab distance from the left */
+}
+.gwt-DecoratedTabBar .gwt-TabBarRest {
+}
+.gwt-DecoratedTabBar .gwt-TabBarItem {
+ border-collapse: collapse;
+ margin-left: 0px;
+
+}
+
+.gwt-DecoratedTabBar .gwt-TabBarItem-selected {
+
+}
+
+.gwt-DecoratedTabBar .tabTopCenter {
+ padding: 0px;
+ background: #ffffff;
+ border-top:1px solid #c4c4c4;
+}
+.gwt-DecoratedTabBar .tabTopLeft,
+.gwt-DecoratedTabBar .tabTopRight {
+ padding: 0px;
+ zoom: 1;
+}
+.gwt-DecoratedTabBar .tabTopLeftInner,
+.gwt-DecoratedTabBar .tabTopRightInner {
+ width: 6px;
+ height: 6px;
+}
+.gwt-DecoratedTabBar .tabTopLeft {
+ background: #ffffff;
+ border-left:1px solid #c4c4c4;
+ border-top:1px solid #c4c4c4;
+}
+.gwt-DecoratedTabBar .tabTopRight {
+ background: #ffffff;
+ border-right:1px solid #c4c4c4;
+ border-top:1px solid #c4c4c4;
+}
+* html .gwt-DecoratedTabBar .tabTopLeftInner,
+* html .gwt-DecoratedTabBar .tabTopRightInner {
+ width: 6px;
+ height: 6px;
+ overflow: hidden;
+}
+.gwt-DecoratedTabBar .tabMiddleLeft{
+ width: 6px;
+ padding: 0px;
+ border-left:1px solid #c4c4c4;
+ background: #E3E8F3 url(gwt/chrome/images/hborder.png) repeat-x 0px -2003px;
+}
+.gwt-DecoratedTabBar .tabMiddleRight {
+ width: 6px;
+ padding: 0px;
+ border-right:1px solid #c4c4c4;
+ background: #E3E8F3 url(gwt/chrome/images/hborder.png) repeat-x 0px -2003px;
+}
+.gwt-DecoratedTabBar .tabMiddleLeftInner,
+.gwt-DecoratedTabBar .tabMiddleRightInner {
+ width: 0px;
+ height: 0px;
+}
+.gwt-DecoratedTabBar .tabMiddleCenter {
+ padding: 0px 4px 2px 4px;
+ font-weight: bold;
+ text-align: center;
+ background: #E3E8F3 url(gwt/chrome/images/hborder.png) repeat-x 0px -2003px;
+}
+
+.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopCenter {
+ background: #ffffff;
+}
+.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopLeft {
+ /*background-position: 0px -61px;*/
+}
+.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopRight {
+ /*background-position: -6px -61px;*/
+}
+
+.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleLeft,
+.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleRight {
+ background: #E3E8F3 url(gwt/chrome/images/hborder.png) repeat-x 0px -2003px;
+}
+
+.gwt-DecoratedTabBar .gwt-TabBarItem-disabled .tabMiddleLeft,
+.gwt-DecoratedTabBar .gwt-TabBarItem-disabled .tabMiddleRight {
+ background: #E3E8F3 url(gwt/chrome/images/hborder.png) repeat-x 0px -2003px;
+ /*background: #e3e8f3 url(images/hborder.png) repeat-x 0px -2003px;*/
+}
+
+.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleCenter {
+ cursor: default;
+ color:#000000;
+ background: #E3E8F3 url(gwt/chrome/images/hborder.png) repeat-x 0px -2003px;
+}
+
+.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleCenter div { /*tab text*/
+ color:#000000;
+}
+
+.gwt-DecoratedTabBar .tabMiddleCenter div { /*tab text*/
+ color:#ccc;
+}
+
+.gwt-DecoratedTabBar .gwt-TabBarItem-disabled .tabMiddleCenter {
+ cursor: hand;
+ cursor: pointer;
+}
+
+
+
+.gwt-TabBarItem-wrapper {
+ padding-left:6px;
+ border-bottom: 1px solid #bcbcbc;
+}
+
+.gwt-TabBarItem-wrapper-selected {
+ /*border-bottom: 1px solid #bcbcbc;*/
+}
+
+.gwt-TabBarFirst-wrapper {
+ border-bottom: 1px solid #bcbcbc;
+}
+
+.gwt-TabBarRest-wrapper {
+ border-bottom: 1px solid #bcbcbc;
+}
+
+/*** StackLayoutPanel ***/
+
+.mosaic-StackLayoutPanel {
+}
+
+.mosaic-StackLayoutPanel .mosaic-StackLayoutPanelItem {
+ cursor: pointer;
+ cursor: hand;
+ background:#ffffff;
+}
+.mosaic-StackLayoutPanel .mosaic-StackLayoutPanelItem-selected {
+ cursor: pointer;
+ cursor: hand;
+}
+.mosaic-StackLayoutPanelContent {
+ background:#ffffff;
+ border-bottom:1px solid #ccc;
+}
+
+/*** Decorator Panel***/
+
+.gwt-DecoratorPanel {
+
+}
+.gwt-DecoratorPanel .topCenter,
+.gwt-DecoratorPanel .bottomCenter {
+ background: #c4c4c4;
+}
+.gwt-DecoratorPanel .middleLeft,
+.gwt-DecoratorPanel .middleRight {
+ background: #c4c4c4;
+}
+.gwt-DecoratorPanel .topLeftInner,
+.gwt-DecoratorPanel .topRightInner,
+.gwt-DecoratorPanel .bottomLeftInner,
+.gwt-DecoratorPanel .bottomRightInner {
+ width: 1px;
+ height: 1px;
+ zoom: 1;
+}
+.gwt-DecoratorPanel .topLeft {
+ background: #c4c4c4;
+}
+.gwt-DecoratorPanel .topRight {
+ background: #c4c4c4;
+}
+.gwt-DecoratorPanel .bottomLeft {
+ background: #c4c4c4;
+}
+.gwt-DecoratorPanel .bottomRight {
+ background: #c4c4c4;
+}
+* html .gwt-DecoratorPanel .topLeftInner,
+* html .gwt-DecoratorPanel .topRightInner,
+* html .gwt-DecoratorPanel .bottomLeftInner,
+* html .gwt-DecoratorPanel .bottomRightInner {
+ width: 1px;
+ height: 1px;
+ overflow: hidden;
+}
+
+/*** ScrollTable ***/
+
+.gwt-ScrollTable {
+ border: 1px solid #CCC;
+}
+
+.mosaic-ColumnWidget,
+.mosaic-ScrollTreeTable {
+ border-color: #aaa;
+ border-style: solid;
+ border-width: 1px 0px 1px 1px;
+}
+
+.gwt-ScrollTable .headerWrapper,
+.mosaic-ColumnWidget .headerWrapper,
+.mosaic-ScrollTreeTable .headerWrapper {
+ background: #666;
+}
+
+.gwt-ScrollTable .footerWrapper,
+.mosaic-ColumnWidget .footerWrapper,
+.mosaic-ScrollTreeTable .footerWrapper {
+ border-top: 1px solid #aaa;
+ background: #666;
+}
+
+.gwt-ScrollTable .dataTable td,
+.gwt-ScrollTable .headerTable td,
+.gwt-ScrollTable .footerTable td,
+.mosaic-ColumnWidget .dataTable td,
+.mosaic-ColumnWidget .headerTable td,
+.mosaic-ColumnWidget .footerTable td,
+.mosaic-ScrollTreeTable .dataTable td,
+.mosaic-ScrollTreeTable .headerTable td,
+.mosaic-ScrollTreeTable .footerTable td {
+ border-color: #ccc;
+ border-style: solid;
+ border-width: 0px 1px 1px 0px;
+ white-space: nowrap;
+ overflow: hidden;
+ font-size:12px;
+}
+
+.gwt-ScrollTable .headerTable td,
+.gwt-ScrollTable .footerTable td,
+.mosaic-ColumnWidget .headerTable td,
+.mosaic-ColumnWidget .footerTable td,
+.mosaic-ScrollTreeTable .headerTable td,
+.mosaic-ScrollTreeTable .footerTable td {
+ color: #fff;
+}
+
+.gwt-ScrollTable .dataTable tr.highlighted, /* gen2 */
+.gwt-ScrollTable .dataTable tr.hovering,
+.mosaic-ColumnWidget .dataTable tr.hovering,
+.mosaic-ScrollTreeTable .dataTable tr.hovering {
+ background: #C3D9FF; /*#C3D9FF*/ /*lighter blue*/
+}
+
+.gwt-ScrollTable .dataTable td.highlighted, /* gen2 */
+.gwt-ScrollTable .dataTable td.hovering,
+.mosaic-ColumnWidget .dataTable td.hovering,
+.mosaic-ScrollTreeTable .dataTable td.hovering {
+ background: #EFF5F9;/*#FFFFAA; */ /*yellow*/
+ cursor: hand;
+ cursor: pointer;
+}
+
+.gwt-ScrollTable .dataTable tr.selected,
+.mosaic-ColumnWidget .dataTable tr.selected,
+.mosaic-ScrollTreeTable .dataTable tr.selected {
+ background: #7AA5D6;/*#7AA5D6;*/ /*light blue*/
+}
+
+.gwt-ScrollTable .pagingOptions {
+ background: #e8eef7; /**/
+ border-top: 1px solid #aaa;
+ border-right: 1px solid #aaa;
+ padding: 1px 0px;
+}
+
+.gwt-ScrollTable .pagingOptions .errorMessage {
+ color: red;
+}
+
+.gwt-PagingOptions .gwt-Image {
+ cursor: hand;
+ cursor: pointer;
+}
+
+.gwt-InlineCellEditor {
+ border: 3px solid #7AA5D6;
+ padding: 4px;
+ background: white;
+ overflow: auto;
+}
+.gwt-InlineCellEditor .accept {
+ cursor: pointer;
+ cursor: hand;
+}
+.gwt-InlineCellEditor .cancel {
+ cursor: pointer;
+ cursor: hand;
+}
+
+
+/*** DropDownPanel ***/
+
+.mosaic-DropDownPanel {
+
+}
+
+.mosaic-DropDownPanel .mosaic-ComboBoxList {
+ background: white;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+.mosaic-DropDownPanel .gwt-ScrollTable,
+.mosaic-DropDownPanel .mosaic-ColumnWidget,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable {
+ border-color: #aaa;
+ border-style: solid;
+ border-width: 1px 0px 1px 1px;
+}
+
+.mosaic-DropDownPanel .gwt-ScrollTable .headerWrapper,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .headerWrapper,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .headerWrapper {
+ background: #666;
+}
+
+.mosaic-DropDownPanel .gwt-ScrollTable .footerWrapper,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .footerWrapper,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .footerWrapper {
+ border-top: 1px solid #aaa;
+ background: #666;
+}
+
+.mosaic-DropDownPanel .gwt-ScrollTable .dataTable td,
+.mosaic-DropDownPanel .gwt-ScrollTable .headerTable td,
+.mosaic-DropDownPanel .gwt-ScrollTable .footerTable td,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable td,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .headerTable td,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .footerTable td,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable td,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .headerTable td,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .footerTable td {
+ border-color: #aaa;
+ border-style: solid;
+ border-width: 0px 0px 0px 0px;
+ white-space: nowrap;
+ overflow: hidden;
+ padding: 1px 3px;
+}
+
+.mosaic-DropDownPanel .gwt-ScrollTable .headerTable td,
+.mosaic-DropDownPanel .gwt-ScrollTable .footerTable td,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .headerTable td,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .footerTable td,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .headerTable td,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .footerTable td {
+ color: #fff;
+}
+
+.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.hovering,
+.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.highlighted,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.hovering,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.highlighted,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.hovering,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.highlighted {
+ background: #C3D9FF;
+}
+
+.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.hovering,
+.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.highlighted,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.hovering,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.highlighted,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.hovering,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.highlighted {
+ /*background: #FFFFAA;*/
+ cursor: hand;
+ cursor: pointer;
+}
+
+.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.selected td,
+.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.selected td,
+.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.selected td {
+ background: #7AA5D6;
+}
+
+
+/** popup panel **/
+
+.gwt-DecoratedPopupPanel .popupContent {
+}
+.gwt-DecoratedPopupPanel .popupMiddleCenter {
+ padding: 0px;
+ border: 1px solid #ccc;
+ background: #ffffff;
+}
+.gwt-DecoratedPopupPanel .popupTopCenter {
+ /*background: url(images/hborder.png) repeat-x;*/
+ background:#ffffff;
+}
+.gwt-DecoratedPopupPanel .popupBottomCenter {
+ /*background: url(images/hborder.png) repeat-x 0px -4px;
+ -background: url(images/hborder_ie6.png) repeat-x 0px -4px;*/
+ background:#ffffff;
+}
+.gwt-DecoratedPopupPanel .popupMiddleLeft {
+ /*background: url(images/vborder.png) repeat-y;*/
+ background:#ffffff;
+}
+.gwt-DecoratedPopupPanel .popupMiddleRight {
+ /*background: url(images/vborder.png) repeat-y -4px 0px;
+ -background: url(images/vborder_ie6.png) repeat-y -4px 0px;*/
+ background:#ffffff;
+}
+.gwt-DecoratedPopupPanel .popupTopLeftInner {
+ width: 0px;
+ height: 0px;
+ zoom: 1;
+}
+.gwt-DecoratedPopupPanel .popupTopRightInner {
+ width: 0px;
+ height: 0px;
+ zoom: 1;
+}
+.gwt-DecoratedPopupPanel .popupBottomLeftInner {
+ width: 0px;
+ height: 0px;
+ zoom: 1;
+}
+.gwt-DecoratedPopupPanel .popupBottomRightInner {
+ width: 0px;
+ height: 0px;
+ zoom: 1;
+}
+.gwt-DecoratedPopupPanel .popupTopLeft {
+ /*background: url(images/corner.png) no-repeat 0px -10px;
+ -background: url(images/corner_ie6.png) no-repeat 0px -10px;*/
+ background:#ffffff;
+}
+.gwt-DecoratedPopupPanel .popupTopRight {
+ /*background: url(images/corner.png) no-repeat -5px -10px;
+ -background: url(images/corner_ie6.png) no-repeat -5px -10px;*/
+ background:#ffffff;
+}
+.gwt-DecoratedPopupPanel .popupBottomLeft {
+ /*background: url(images/corner.png) no-repeat 0px -15px;
+ -background: url(images/corner_ie6.png) no-repeat 0px -15px;*/
+ background:#ffffff;
+}
+.gwt-DecoratedPopupPanel .popupBottomRight {
+ /*background: url(images/corner.png) no-repeat -5px -15px;
+ -background: url(images/corner_ie6.png) no-repeat -5px -15px;*/
+ background:#ffffff;
+}
+* html .gwt-DecoratedPopupPanel .popupTopLeftInner {
+ width: 5px;
+ height: 5px;
+ overflow: hidden;
+}
+* html .gwt-DecoratedPopupPanel .popupTopRightInner {
+ width: 8px;
+ height: 5px;
+ overflow: hidden;
+}
+* html .gwt-DecoratedPopupPanel .popupBottomLeftInner {
+ width: 5px;
+ height: 8px;
+ overflow: hidden;
+}
+* html .gwt-DecoratedPopupPanel .popupBottomRightInner {
+ width: 8px;
+ height: 8px;
+ overflow: hidden;
+}
+
+
+/* start - override gwt-log styles */
+.mosaic-layoutpanel .log-panel {
+ background-color: #ECF2FC;
+ border: 0px solid #ccc;
+ margin: 0px;
+ padding:2px;
+
+}
+
+.log-panel .log-scroll-panel {
+ width: 100% !important;
+ height: 100px !important;
+}
+
+.log-panel .log-text-area,.log-panel BUTTON {
+ font-size: 8pt;
+ margin: 0em;
+}
+
+.log-resize-se {
+ visibility:hidden;
+}
Added: console/trunk/picketlink-console/src/main/resources/picketlink_banner.png
===================================================================
(Binary files differ)
Property changes on: console/trunk/picketlink-console/src/main/resources/picketlink_banner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: console/trunk/picketlink-console/src/test/java/org/picketlink/test/console/sts/STSConfigFilePersistUnitTestCase.java
===================================================================
--- console/trunk/picketlink-console/src/test/java/org/picketlink/test/console/sts/STSConfigFilePersistUnitTestCase.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/test/java/org/picketlink/test/console/sts/STSConfigFilePersistUnitTestCase.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -28,7 +28,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
import org.picketlink.console.client.model.STSConfig;
-import org.picketlink.console.client.model.TokenProvider;
+import org.picketlink.console.client.model.TokenProviderObject;
import org.picketlink.console.server.handlers.STSConfigurationHandler;
import org.picketlink.identity.federation.core.impl.KeyStoreKeyManager;
import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider;
@@ -74,9 +74,9 @@
stsConfig.setSigningKeyAlias( "jboss" );
stsConfig.setSigningKeyPass( "testpass" );
- Set<TokenProvider> tokenProviders = new HashSet<TokenProvider>();
- TokenProvider saml20TokenProvider = new TokenProvider();
- saml20TokenProvider.setProvider( SAML20TokenProvider.class.getCanonicalName() );
+ Set<TokenProviderObject> tokenProviders = new HashSet<TokenProviderObject>();
+ TokenProviderObject saml20TokenProvider = new TokenProviderObject();
+ saml20TokenProvider.setProviderClass( SAML20TokenProvider.class.getCanonicalName() );
saml20TokenProvider.setTokenType( "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" );
tokenProviders.add( saml20TokenProvider );
Modified: console/trunk/picketlink-console/src/test/java/org/picketlink/test/console/sts/TokenProviderFilePersistUnitTestCase.java
===================================================================
--- console/trunk/picketlink-console/src/test/java/org/picketlink/test/console/sts/TokenProviderFilePersistUnitTestCase.java 2010-05-05 21:14:48 UTC (rev 240)
+++ console/trunk/picketlink-console/src/test/java/org/picketlink/test/console/sts/TokenProviderFilePersistUnitTestCase.java 2010-05-07 19:53:25 UTC (rev 241)
@@ -28,7 +28,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.picketlink.console.client.model.TokenProvider;
+import org.picketlink.console.client.model.TokenProviderObject;
import org.picketlink.console.server.handlers.TokenProviderConfigurationHandler;
import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider;
@@ -63,16 +63,16 @@
@Test
public void testTokenProviderPersistence() throws Exception
{
- TokenProvider tokenProvider = new TokenProvider();
- tokenProvider.setProvider( SAML20TokenProvider.class.getCanonicalName() );
+ TokenProviderObject tokenProvider = new TokenProviderObject();
+ tokenProvider.setProviderClass( SAML20TokenProvider.class.getCanonicalName() );
tokenProvider.setTokenType( "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" );
TokenProviderConfigurationHandler handler = new TokenProviderConfigurationHandler();
handler.persist( tokenProvider );
//Let us peek at the stored token providers
- Set<TokenProvider> tokenProvidersSet = handler.getTokenProviders();
+ Set<TokenProviderObject> tokenProvidersSet = handler.getTokenProviders();
assertEquals( 1, tokenProvidersSet.size() );
- TokenProvider samlTokenProvider = tokenProvidersSet.iterator().next();
- assertEquals( SAML20TokenProvider.class.getCanonicalName(), samlTokenProvider.getProvider());
+ TokenProviderObject samlTokenProvider = tokenProvidersSet.iterator().next();
+ assertEquals( SAML20TokenProvider.class.getCanonicalName(), samlTokenProvider.getProviderClass());
}
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list