March 2012 - picketlink-commits - Jboss List Archives

Picketlink SVN: r1543 - idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2012-03-28 04:03:48 -0400 (Wed, 28 Mar 2012) New Revision: 1543 Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreConfiguration.java idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SimpleLDAPIdentityStoreConfiguration.java Log: PLIDM-37 Configuration switch to not cache empty LDAP results Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreConfiguration.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreConfiguration.java 2012-03-26 21:55:35 UTC (rev 1542) +++ idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreConfiguration.java 2012-03-28 08:03:48 UTC (rev 1543) @@ -93,5 +93,7 @@ int getPagedExtensionSize(); public boolean isAllowNotCaseSensitiveSearch(); + + public boolean isCacheEmptySearchResults(); } Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2012-03-26 21:55:35 UTC (rev 1542) +++ idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2012-03-28 08:03:48 UTC (rev 1543) @@ -3885,7 +3885,9 @@ ldapContext.close(); } - if (getCache() != null && finalResults != null) + if (getCache() != null + && finalResults != null + && (finalResults.size() > 0 || configuration.isCacheEmptySearchResults())) { LDAPSearch search = new LDAPSearch(entryCtxs, filter, filterArgs, returningAttributes, searchScope, requestControls); Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SimpleLDAPIdentityStoreConfiguration.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SimpleLDAPIdentityStoreConfiguration.java 2012-03-26 21:55:35 UTC (rev 1542) +++ idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SimpleLDAPIdentityStoreConfiguration.java 2012-03-28 08:03:48 UTC (rev 1543) @@ -95,7 +95,9 @@ private final boolean allowNotCaseSensitiveSearch; + private final boolean cacheEmptySearchResults; + // Consts public static final String PROVIDER_URL = "providerURL"; @@ -152,6 +154,9 @@ public static final String ALLOW_NOT_CASE_SENSITIVE_SEARCH = "allowNotCaseSensitiveSearch"; + public static final String CACHE_EMPTY_SEARCH_RESULTS = "cacheEmptySearchResults"; + + public SimpleLDAPIdentityStoreConfiguration(IdentityStoreConfigurationMetaData storeMD) { if (storeMD == null) @@ -246,6 +251,16 @@ this.allowNotCaseSensitiveSearch = false; } + String cacheEmptySearchResults = storeMD.getOptionSingleValue(CACHE_EMPTY_SEARCH_RESULTS); + if (cacheEmptySearchResults != null && cacheEmptySearchResults.equalsIgnoreCase("false")) + { + this.cacheEmptySearchResults = false; + } + else + { + this.cacheEmptySearchResults = true; + } + Map<String, LDAPIdentityObjectTypeConfiguration> types = new HashMap<String, LDAPIdentityObjectTypeConfiguration>(); for (IdentityObjectTypeMetaData identityObjectTypeMetaData : storeMD.getSupportedIdentityTypes()) @@ -568,4 +583,9 @@ { return allowNotCaseSensitiveSearch; } + + public boolean isCacheEmptySearchResults() + { + return cacheEmptySearchResults; + } }

12 years, 6 months

1
0
0 / 0

Picketlink SVN: r1542 - console/trunk/app.

by picketlink-commits＠lists.jboss.org

Author: pcraveiro Date: 2012-03-26 17:55:35 -0400 (Mon, 26 Mar 2012) New Revision: 1542 Modified: console/trunk/app/pom.xml Log: Added more features. Modified: console/trunk/app/pom.xml =================================================================== --- console/trunk/app/pom.xml 2012-03-26 21:55:14 UTC (rev 1541) +++ console/trunk/app/pom.xml 2012-03-26 21:55:35 UTC (rev 1542) @@ -152,7 +152,7 @@ </executions> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> - <packagingExcludes>WEB-INF/**</packagingExcludes> + <packagingExcludes>WEB-INF/lib/**</packagingExcludes> <overlays> <overlay> <id>core-web-resources</id> @@ -251,7 +251,7 @@ </executions> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> - <packagingExcludes>WEB-INF/**</packagingExcludes> + <packagingExcludes>WEB-INF/lib/**</packagingExcludes> <overlays> <overlay> <id>core-web-resources</id>

12 years, 6 months

1
0
0 / 0

Picketlink SVN: r1541 - in console/trunk/gui/src/main/java/org/picketlink/as/console: client and 2 other directories.

by picketlink-commits＠lists.jboss.org

Author: pcraveiro Date: 2012-03-26 17:55:14 -0400 (Mon, 26 Mar 2012) New Revision: 1541 Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/PicketLinkConsoleFramework.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/TrustDomain.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractWizardStep.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractWizardView.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewServiceProviderWizard.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewServiceProviderWizardStep1.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderRestartColumn.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/TrustDomainTable.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/WizardView.java Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/PicketLinkConsole.gwt.xml console/trunk/gui/src/main/java/org/picketlink/as/console/client/BeanFactory.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/FederationStore.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/FederationStoreImpl.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/IdentityProvider.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/ServiceProvider.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractFederationDetails.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractModelElementTable.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/EditableFederationDetails.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationDetails.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationEditor.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationPresenter.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationTable.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationView.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/IdentityProviderDetails.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewFederationWizard.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewFederationWizardStep1.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderDetails.java console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderTable.java Log: Added more features. Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/PicketLinkConsole.gwt.xml =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/PicketLinkConsole.gwt.xml 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/PicketLinkConsole.gwt.xml 2012-03-26 21:55:14 UTC (rev 1541) @@ -15,11 +15,17 @@ <module rename-to="PicketLinkConsole"> <inherits name="org.jboss.as.console.App" /> + + <generate-with + class="org.picketlink.as.console.rebind.extension.PicketLinkApplicationMetaDataGenerator"> + <when-type-assignable + class="org.jboss.as.console.client.widgets.forms.ApplicationMetaData" /> + </generate-with> + + <replace-with class="org.picketlink.as.console.client.PicketLinkConsoleFramework"> + <when-type-is class="org.jboss.ballroom.client.spi.Framework" /> + </replace-with> - <generate-with class="org.picketlink.as.console.rebind.extension.PicketLinkApplicationMetaDataGenerator"> - <when-type-assignable class="org.jboss.as.console.client.widgets.forms.ApplicationMetaData" /> - </generate-with> -  <source path='client' /> <source path='shared' /> Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/BeanFactory.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/BeanFactory.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/BeanFactory.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -25,6 +25,7 @@ import org.picketlink.as.console.client.shared.subsys.model.Federation; import org.picketlink.as.console.client.shared.subsys.model.IdentityProvider; import org.picketlink.as.console.client.shared.subsys.model.ServiceProvider; +import org.picketlink.as.console.client.shared.subsys.model.TrustDomain; import com.google.gwt.autobean.shared.AutoBean; @@ -43,4 +44,6 @@ AutoBean<IdentityProvider> identityProvider(); AutoBean<ServiceProvider> serviceProvider(); + + AutoBean<TrustDomain> trustDomain(); } Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/PicketLinkConsoleFramework.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/PicketLinkConsoleFramework.java (rev 0) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/PicketLinkConsoleFramework.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.as.console.client; + +import org.jboss.as.console.client.Console; +import org.jboss.ballroom.client.spi.Framework; + +import com.google.gwt.autobean.shared.AutoBeanFactory; +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.shared.EventBus; +import com.gwtplatform.mvp.client.proxy.PlaceManager; + +/** + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 20, 2012 + */ +public class PicketLinkConsoleFramework implements Framework { + + private final static BeanFactory factory = GWT.create(BeanFactory.class); + + @Override + public EventBus getEventBus() { + return Console.MODULES.getEventBus(); + } + + @Override + public PlaceManager getPlaceManager() { + return Console.MODULES.getPlaceManager(); + } + + @Override + public AutoBeanFactory getBeanFactory() { + return factory; + } +} Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/FederationStore.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/FederationStore.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/FederationStore.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -23,8 +23,10 @@ package org.picketlink.as.console.client.shared.subsys.model; import java.util.List; +import java.util.Map; import org.jboss.as.console.client.domain.model.SimpleCallback; +import org.jboss.as.console.client.shared.model.ResponseWrapper; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -54,9 +56,87 @@ void loadIdentityProviders(Federation federation, final AsyncCallback<List<IdentityProvider>> callback); /** + * + * Loads the service providers configurations given a federation instance. + * + * * @param federation * @param simpleCallback */ void loadServiceProviders(Federation federation, SimpleCallback<List<ServiceProvider>> simpleCallback); + + /** + * + * Create a new federation element configuration in the subsystem. + * + * + * @param datasource + * @param callback + */ + void createFederation(Federation federation, AsyncCallback<ResponseWrapper<Boolean>> callback); + + /** + * + * Deletes a federation element configuration from the subsystem. + * + * + * @param federation + * @param simpleCallback + */ + void deleteFederation(Federation federation, SimpleCallback<Boolean> simpleCallback); + + /** + * @param identityProvider + * @param simpleCallback + */ + void createIdentityProvider(Federation federation, IdentityProvider identityProvider, SimpleCallback<ResponseWrapper<Boolean>> simpleCallback); + + /** + * @param federation + * @param changedValues + * @param simpleCallback + */ + void updateIdentityProvider(Federation federation, IdentityProvider identityProvider, Map<String, Object> changedValues, + SimpleCallback<ResponseWrapper<Boolean>> simpleCallback); + + /** + * @param currentFederation + * @param serviceProvider + * @param simpleCallback + */ + void createServiceProvider(Federation currentFederation, ServiceProvider serviceProvider, + SimpleCallback<ResponseWrapper<Boolean>> simpleCallback); + + /** + * @param currentFederation + * @param trustDomain + * @param simpleCallback + */ + void createTrustDomain(Federation currentFederation, IdentityProvider identityProvider, TrustDomain trustDomain, + SimpleCallback<ResponseWrapper<Boolean>> simpleCallback); + + /** + * @param currentFederation + * @param identityProvider + * @param simpleCallback + */ + void loadTrustDomains(Federation currentFederation, IdentityProvider identityProvider, + SimpleCallback<List<TrustDomain>> simpleCallback); + + /** + * @param currentFederation + * @param identityProvider + * @param simpleCallback + */ + void deleteTrustDomain(Federation currentFederation, IdentityProvider identityProvider, TrustDomain trustDomain, + SimpleCallback<Boolean> callback); + + /** + * @param currentFederation + * @param serviceProvider + * @param simpleCallback + */ + void deleteServiceProvider(Federation currentFederation, ServiceProvider serviceProvider, + SimpleCallback<Boolean> simpleCallback); } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/FederationStoreImpl.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/FederationStoreImpl.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/FederationStoreImpl.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -22,11 +22,17 @@ package org.picketlink.as.console.client.shared.subsys.model; +import static org.jboss.dmr.client.ModelDescriptionConstants.ADD; +import static org.jboss.dmr.client.ModelDescriptionConstants.ADDRESS; import static org.jboss.dmr.client.ModelDescriptionConstants.OP; +import static org.jboss.dmr.client.ModelDescriptionConstants.OUTCOME; import static org.jboss.dmr.client.ModelDescriptionConstants.READ_CHILDREN_RESOURCES_OPERATION; +import static org.jboss.dmr.client.ModelDescriptionConstants.REMOVE; import static org.jboss.dmr.client.ModelDescriptionConstants.RESULT; +import static org.jboss.dmr.client.ModelDescriptionConstants.SUCCESS; import java.util.List; +import java.util.Map; import javax.inject.Inject; @@ -34,6 +40,8 @@ import org.jboss.as.console.client.shared.dispatch.DispatchAsync; import org.jboss.as.console.client.shared.dispatch.impl.DMRAction; import org.jboss.as.console.client.shared.dispatch.impl.DMRResponse; +import org.jboss.as.console.client.shared.model.ModelAdapter; +import org.jboss.as.console.client.shared.model.ResponseWrapper; import org.jboss.as.console.client.shared.subsys.Baseadress; import org.jboss.as.console.client.widgets.forms.AddressBinding; import org.jboss.as.console.client.widgets.forms.ApplicationMetaData; @@ -63,6 +71,8 @@ private Baseadress baseadress; private BeanMetaData identityProviderMetaData; private BeanMetaData serviceProviderMetaData; + private BeanMetaData trustDomainMetaData; + private EntityAdapter<TrustDomain> trustDomainAdapter; @Inject public FederationStoreImpl(DispatchAsync dispatcher, ApplicationMetaData propertyMetaData, Baseadress baseadress) { @@ -72,12 +82,244 @@ this.federationMetaData = metaData.getBeanMetaData(Federation.class); this.identityProviderMetaData = metaData.getBeanMetaData(IdentityProvider.class); this.serviceProviderMetaData = metaData.getBeanMetaData(ServiceProvider.class); + this.trustDomainMetaData = metaData.getBeanMetaData(TrustDomain.class); this.federationAdapter = new EntityAdapter<Federation>(Federation.class, propertyMetaData); this.identityProviderAdapter = new EntityAdapter<IdentityProvider>(IdentityProvider.class, propertyMetaData); this.serviceProviderAdapter = new EntityAdapter<ServiceProvider>(ServiceProvider.class, propertyMetaData); + this.trustDomainAdapter = new EntityAdapter<TrustDomain>(TrustDomain.class, propertyMetaData); } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#createFederation(org.picketlink.as.console.client.shared.subsys.model.Federation, com.google.gwt.user.client.rpc.AsyncCallback) + */ + @Override + public void createFederation(final Federation federation, final AsyncCallback<ResponseWrapper<Boolean>> callback) { + AddressBinding address = federationMetaData.getAddress(); + ModelNode addressModel = address.asResource(baseadress.getAdress(), federation.getAlias()); + ModelNode operation = federationAdapter.fromEntity(federation); + operation.get(OP).set(ADD); + operation.get(ADDRESS).set(addressModel.get(ADDRESS)); + + dispatcher.execute(new DMRAction(operation), new SimpleCallback<DMRResponse>() { + + @Override + public void onFailure(Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess(DMRResponse result) { + ModelNode modelNode = result.get(); + boolean wasSuccessful = modelNode.get(OUTCOME).asString().equals(SUCCESS); + + callback.onSuccess(new ResponseWrapper<Boolean>(wasSuccessful, modelNode)); + } + }); + } + /* (non-Javadoc) + * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#createIdentityProvider(org.picketlink.as.console.client.shared.subsys.model.IdentityProvider, org.jboss.as.console.client.domain.model.SimpleCallback) + */ + @Override + public void createIdentityProvider(Federation federation, final IdentityProvider identityProvider, + final SimpleCallback<ResponseWrapper<Boolean>> callback) { + AddressBinding address = identityProviderMetaData.getAddress(); + ModelNode addressModel = address.asResource(baseadress.getAdress(), federation.getAlias(), identityProvider.getAlias()); + + ModelNode operation = identityProviderAdapter.fromEntity(identityProvider); + operation.get(OP).set(ADD); + operation.get(ADDRESS).set(addressModel.get(ADDRESS)); + + dispatcher.execute(new DMRAction(operation), new SimpleCallback<DMRResponse>() { + + @Override + public void onFailure(Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess(DMRResponse result) { + ModelNode modelNode = result.get(); + boolean wasSuccessful = modelNode.get(OUTCOME).asString().equals(SUCCESS); + + callback.onSuccess(new ResponseWrapper<Boolean>(wasSuccessful, modelNode)); + } + }); + } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#createServiceProvider(org.picketlink.as.console.client.shared.subsys.model.Federation, org.picketlink.as.console.client.shared.subsys.model.ServiceProvider, org.jboss.as.console.client.domain.model.SimpleCallback) + */ + @Override + public void createServiceProvider(Federation federation, final ServiceProvider serviceProvider, + final SimpleCallback<ResponseWrapper<Boolean>> callback) { + AddressBinding address = serviceProviderMetaData.getAddress(); + ModelNode addressModel = address.asResource(baseadress.getAdress(), federation.getAlias(), serviceProvider.getAlias()); + + ModelNode operation = serviceProviderAdapter.fromEntity(serviceProvider); + operation.get(OP).set(ADD); + operation.get(ADDRESS).set(addressModel.get(ADDRESS)); + + dispatcher.execute(new DMRAction(operation), new SimpleCallback<DMRResponse>() { + + @Override + public void onFailure(Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess(DMRResponse result) { + ModelNode modelNode = result.get(); + boolean wasSuccessful = modelNode.get(OUTCOME).asString().equals(SUCCESS); + + callback.onSuccess(new ResponseWrapper<Boolean>(wasSuccessful, modelNode)); + } + }); + } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#createTrustDomain(org.picketlink.as.console.client.shared.subsys.model.Federation, org.picketlink.as.console.client.shared.subsys.model.TrustDomain, org.jboss.as.console.client.domain.model.SimpleCallback) + */ + @Override + public void createTrustDomain(Federation federation, IdentityProvider identityProvider, TrustDomain trustDomain, + final SimpleCallback<ResponseWrapper<Boolean>> callback) { + AddressBinding address = trustDomainMetaData.getAddress(); + ModelNode addressModel = address.asResource(baseadress.getAdress(), federation.getAlias(), identityProvider.getAlias(), trustDomain.getName()); + + ModelNode operation = trustDomainAdapter.fromEntity(trustDomain); + operation.get(OP).set(ADD); + operation.get(ADDRESS).set(addressModel.get(ADDRESS)); + + dispatcher.execute(new DMRAction(operation), new SimpleCallback<DMRResponse>() { + + @Override + public void onFailure(Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess(DMRResponse result) { + ModelNode modelNode = result.get(); + boolean wasSuccessful = modelNode.get(OUTCOME).asString().equals(SUCCESS); + + callback.onSuccess(new ResponseWrapper<Boolean>(wasSuccessful, modelNode)); + } + }); + } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#updateIdentityProvider(org.picketlink.as.console.client.shared.subsys.model.Federation, java.util.Map, org.jboss.as.console.client.domain.model.SimpleCallback) + */ + @Override + public void updateIdentityProvider(Federation federation, IdentityProvider identityProvider, Map<String, Object> changedValues, + final SimpleCallback<ResponseWrapper<Boolean>> callback) { + AddressBinding address = this.identityProviderMetaData.getAddress(); + ModelNode addressModel = address.asResource(baseadress.getAdress(), federation.getAlias(), identityProvider.getAlias()); + ModelNode operation = this.identityProviderAdapter.fromChangeset(changedValues, addressModel); + + dispatcher.execute(new DMRAction(operation), new AsyncCallback<DMRResponse>() { + + @Override + public void onFailure(Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess(DMRResponse result) { + + callback.onSuccess(ModelAdapter.wrapBooleanResponse(result)); + } + }); + } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#deleteFederation(org.picketlink.as.console.client.shared.subsys.model.Federation, org.jboss.as.console.client.domain.model.SimpleCallback) + */ + @Override + public void deleteFederation(Federation federation, final SimpleCallback<Boolean> callback) { + AddressBinding address = this.federationMetaData.getAddress(); + ModelNode addressModel = address.asResource(baseadress.getAdress(), federation.getAlias()); + + ModelNode operation = federationAdapter.fromEntity(federation); + operation.get(OP).set(REMOVE); + operation.get(ADDRESS).set(addressModel.get(ADDRESS)); + + dispatcher.execute(new DMRAction(operation), new SimpleCallback<DMRResponse>() { + + @Override + public void onFailure(Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess(DMRResponse result) { + ModelNode modelNode = result.get(); + boolean wasSuccessful = modelNode.get(OUTCOME).asString().equals(SUCCESS); + callback.onSuccess(wasSuccessful); + } + }); + } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#deleteTrustDomain(org.picketlink.as.console.client.shared.subsys.model.Federation, org.picketlink.as.console.client.shared.subsys.model.IdentityProvider, org.jboss.as.console.client.domain.model.SimpleCallback) + */ + @Override + public void deleteTrustDomain(Federation federation, IdentityProvider identityProvider, TrustDomain trustDomain, + final SimpleCallback<Boolean> callback) { + AddressBinding address = this.trustDomainMetaData.getAddress(); + ModelNode addressModel = address.asResource(baseadress.getAdress(), federation.getAlias(), identityProvider.getAlias(), trustDomain.getName()); + + ModelNode operation = trustDomainAdapter.fromEntity(trustDomain); + operation.get(OP).set(REMOVE); + operation.get(ADDRESS).set(addressModel.get(ADDRESS)); + + dispatcher.execute(new DMRAction(operation), new SimpleCallback<DMRResponse>() { + + @Override + public void onFailure(Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess(DMRResponse result) { + ModelNode modelNode = result.get(); + boolean wasSuccessful = modelNode.get(OUTCOME).asString().equals(SUCCESS); + callback.onSuccess(wasSuccessful); + } + }); + } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#deleteServiceProvider(org.picketlink.as.console.client.shared.subsys.model.Federation, org.picketlink.as.console.client.shared.subsys.model.ServiceProvider, org.jboss.as.console.client.domain.model.SimpleCallback) + */ + @Override + public void deleteServiceProvider(Federation federation, ServiceProvider serviceProvider, + final SimpleCallback<Boolean> callback) { + AddressBinding address = this.serviceProviderMetaData.getAddress(); + ModelNode addressModel = address.asResource(baseadress.getAdress(), federation.getAlias(), serviceProvider.getAlias()); + + ModelNode operation = serviceProviderAdapter.fromEntity(serviceProvider); + operation.get(OP).set(REMOVE); + operation.get(ADDRESS).set(addressModel.get(ADDRESS)); + + dispatcher.execute(new DMRAction(operation), new SimpleCallback<DMRResponse>() { + + @Override + public void onFailure(Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess(DMRResponse result) { + ModelNode modelNode = result.get(); + boolean wasSuccessful = modelNode.get(OUTCOME).asString().equals(SUCCESS); + callback.onSuccess(wasSuccessful); + } + }); + } + + /* (non-Javadoc) * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#loadFederations(com.google.gwt.user.client.rpc.AsyncCallback) */ @Override @@ -162,4 +404,34 @@ }); } + /* (non-Javadoc) + * @see org.picketlink.as.console.client.shared.subsys.model.FederationStore#loadTrustDomains(org.picketlink.as.console.client.shared.subsys.model.Federation, org.picketlink.as.console.client.shared.subsys.model.IdentityProvider, org.jboss.as.console.client.domain.model.SimpleCallback) + */ + @Override + public void loadTrustDomains(Federation federation, IdentityProvider identityProvider, + final SimpleCallback<List<TrustDomain>> callback) { + AddressBinding address = this.trustDomainMetaData.getAddress(); + + ModelNode operation = address.asSubresource(federation.getAlias(), identityProvider.getAlias()); + operation.get(OP).set(READ_CHILDREN_RESOURCES_OPERATION); + + dispatcher.execute(new DMRAction(operation), new AsyncCallback<DMRResponse>() { + @Override + public void onFailure(Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess(DMRResponse result) { + ModelNode response = result.get(); + + if (response.isFailure()) { + callback.onFailure(new RuntimeException(response.getFailureDescription())); + } else { + List<TrustDomain> datasources = trustDomainAdapter.fromDMRList(response.get(RESULT).asList()); + callback.onSuccess(datasources); + } + } + }); + } } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/IdentityProvider.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/IdentityProvider.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/IdentityProvider.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -22,6 +22,7 @@ package org.picketlink.as.console.client.shared.subsys.model; +import org.jboss.as.console.client.shared.model.DeploymentRecord; import org.jboss.as.console.client.widgets.forms.Address; import org.jboss.as.console.client.widgets.forms.Binding; @@ -33,7 +34,7 @@ * @since Mar 14, 2012 */ @Address("/subsystem=picketlink/federation={0}/identity-provider={1}") -public interface IdentityProvider { +public interface IdentityProvider extends DeploymentRecord { @Binding(key = true) String getAlias(); @@ -44,11 +45,11 @@ void setUrl(String url); @Binding (detypedName="signOutgoingMessages") - String getSignOutgoingMessages(); - void setSignOutgoingMessages(String url); + boolean isSignOutgoingMessages(); + void setSignOutgoingMessages(boolean url); @Binding (detypedName="ignoreIncomingSignatures") - String getIgnoreIncomingSignatures(); - void setIgnoreIncomingSignatures(String url); + boolean isIgnoreIncomingSignatures(); + void setIgnoreIncomingSignatures(boolean url); } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/ServiceProvider.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/ServiceProvider.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/ServiceProvider.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -22,6 +22,7 @@ package org.picketlink.as.console.client.shared.subsys.model; +import org.jboss.as.console.client.shared.model.DeploymentRecord; import org.jboss.as.console.client.widgets.forms.Address; import org.jboss.as.console.client.widgets.forms.Binding; @@ -29,18 +30,22 @@ * Federation bean definition. * This interface also defines the address to be used when using the AS7 management API. * - * @author Pedro Silva + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> * @since Mar 14, 2012 */ @Address("/subsystem=picketlink/federation={0}/service-provider={0}") -public interface ServiceProvider { +public interface ServiceProvider extends DeploymentRecord { @Binding(key = true) String getAlias(); void setAlias(String alias); - @Binding(key = true) + @Binding String getUrl(); void setUrl(String url); + + @Binding (detypedName="post-binding") + boolean isPostBinding(); + void setPostBinding(boolean postBinding); } Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/TrustDomain.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/TrustDomain.java (rev 0) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/shared/subsys/model/TrustDomain.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.as.console.client.shared.subsys.model; + +import org.jboss.as.console.client.widgets.forms.Address; +import org.jboss.as.console.client.widgets.forms.Binding; + +/** + * TrustDomain bean definition. + * This interface also defines the address to be used when using the AS7 management API. + * + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 14, 2012 + */ +@Address("/subsystem=picketlink/federation={0}/identity-provider={0}/trust-domain={0}") +public interface TrustDomain { + + @Binding(key = true) + String getName(); + void setName(String name); + +} Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractFederationDetails.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractFederationDetails.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractFederationDetails.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -23,9 +23,11 @@ package org.picketlink.as.console.client.ui.federation; import java.util.List; +import java.util.Map; import org.jboss.as.console.client.shared.help.FormHelpPanel; import org.jboss.as.console.client.shared.viewframework.builder.FormLayout; +import org.jboss.as.console.client.widgets.forms.FormToolStrip; import org.jboss.ballroom.client.widgets.forms.Form; import org.jboss.ballroom.client.widgets.forms.FormItem; import org.jboss.dmr.client.ModelNode; @@ -42,7 +44,8 @@ private Form<T> form; private IdentityProvider entityInstance; - + private VerticalPanel detailPanel; + public AbstractFederationDetails() { this.form = new Form(getEntityClass()); this.form.setNumColumns(2); @@ -54,8 +57,8 @@ protected abstract Class<?> getEntityClass(); public Widget asWidget() { - VerticalPanel detailPanel = new VerticalPanel(); - detailPanel.setStyleName("fill-layout-width"); + this.detailPanel = new VerticalPanel(); + this.detailPanel.setStyleName("fill-layout-width"); List<FormItem<?>> formItems = getFormItems(); @@ -65,6 +68,24 @@ Widget formWidget = form.asWidget(); + FormToolStrip<T> toolStrip = new FormToolStrip<T>( + form, + new FormToolStrip.FormCallback<T>() { + @Override + public void onSave(Map<String, Object> changeset) { + doOnSave(changeset); + } + + @Override + public void onDelete(T entity) { + + } + }); + + toolStrip.providesDeleteOp(false); + + detailPanel.add(toolStrip.asWidget()); + final FormHelpPanel helpPanel = new FormHelpPanel(new FormHelpPanel.AddressCallback() { @Override public ModelNode getAddress() { @@ -73,11 +94,15 @@ }, form); - detailPanel.add(formWidget); + this.detailPanel.add(formWidget); - return new FormLayout().setHelp(helpPanel).setForm(form).build(); + return new FormLayout().setHelp(helpPanel).setForm(form).setSetTools(toolStrip).build(); } + protected void doOnSave(Map<String, Object> changeset) { + + } + protected abstract ModelNode getHelpModelAddress(); /** Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractModelElementTable.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractModelElementTable.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractModelElementTable.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -22,10 +22,13 @@ package org.picketlink.as.console.client.ui.federation; +import java.util.List; + import org.jboss.ballroom.client.widgets.tables.DefaultCellTable; import org.jboss.ballroom.client.widgets.tables.DefaultPager; +import org.picketlink.as.console.client.shared.subsys.model.Federation; -import com.google.gwt.user.cellview.client.TextColumn; +import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.google.gwt.view.client.ListDataProvider; @@ -61,6 +64,7 @@ * * @return */ + @SuppressWarnings("unchecked") public DefaultCellTable<T> getCellTable() { if (this.dataTable == null) { this.dataTable = new DefaultCellTable<T>( @@ -71,9 +75,7 @@ return doGetKey(item); } }); - doAddConlumns(this.dataTable); - } return this.dataTable; @@ -84,7 +86,7 @@ /** * @param federationTable2 */ - protected abstract void doAddConlumns(DefaultCellTable<T> federationTable); + protected abstract void doAddConlumns(CellTable federationTable); /** * Returns a instance of {@link ListDataProvider} to be used to manipulate table items. @@ -99,5 +101,13 @@ return this.dataProvider; } + + /** + * @param datasources + */ + public void setList(List<T> items) { + this.getDataProvider().setList(items); + } + } Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractWizardStep.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractWizardStep.java (rev 0) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractWizardStep.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -0,0 +1,133 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.as.console.client.ui.federation; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.as.console.client.Console; +import org.jboss.as.console.client.shared.help.FormHelpPanel; +import org.jboss.ballroom.client.widgets.forms.Form; +import org.jboss.ballroom.client.widgets.forms.FormItem; +import org.jboss.ballroom.client.widgets.forms.FormValidation; +import org.jboss.ballroom.client.widgets.window.DialogueOptions; +import org.jboss.ballroom.client.widgets.window.WindowContentBuilder; +import org.jboss.dmr.client.ModelNode; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; + +/** + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 23, 2012 + */ +public abstract class AbstractWizardStep<T> { + + private WizardView wizard; + private Class entityClass; + private String title; + private Form<T> form; + private List<FormItem> formItems; + + public AbstractWizardStep(String title, WizardView wizard, Class entityClass) { + this.wizard = wizard; + this.entityClass = entityClass; + this.title = title; + } + + public Widget asWidget() { + VerticalPanel layout = new VerticalPanel(); + + layout.setStyleName("window-content"); + layout.add(new HTML("<h3>" + this.title + "</h3>")); + + form = new Form<T>(this.entityClass); + + doAddFormItems(form); + + form.setFields(this.formItems.toArray(new FormItem[this.formItems.size()])); + + final FormHelpPanel helpPanel = new FormHelpPanel( + new FormHelpPanel.AddressCallback() { + @Override + public ModelNode getAddress() { + return doGetHelpAddress(); + } + }, form + ); + + layout.add(helpPanel.asWidget()); + + layout.add(form.asWidget()); + + ClickHandler submitHandler = new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + FormValidation validation = form.validate(); + if(!validation.hasErrors()) + { + wizard.onSave(form.getUpdatedEntity()); + wizard.onClose(); + } + } + }; + + ClickHandler cancelHandler = new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + wizard.onClose(); + } + }; + + DialogueOptions options = new DialogueOptions( + Console.CONSTANTS.common_label_save(),submitHandler, + Console.CONSTANTS.common_label_cancel(),cancelHandler + ); + + return new WindowContentBuilder(layout, options).build(); + } + + /** + * @return + */ + protected abstract void doAddFormItems(Form<T> form); + + protected void addFormItem(FormItem formItem) { + if (this.formItems == null) { + this.formItems = new ArrayList<FormItem>(); + } + + this.formItems.add(formItem); + } + + /** + * @return + */ + protected ModelNode doGetHelpAddress() { + return null; + } + +} Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractWizardView.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractWizardView.java (rev 0) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/AbstractWizardView.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.as.console.client.ui.federation; + +import org.jboss.as.console.client.Console; +import org.jboss.ballroom.client.widgets.window.DefaultWindow; + +import com.google.gwt.user.client.ui.DeckPanel; +import com.google.gwt.user.client.ui.Widget; +import com.gwtplatform.mvp.client.Presenter; + +/** + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 23, 2012 + */ +public abstract class AbstractWizardView implements WizardView<P, T> { + + private P presenter; + private DeckPanel deck; + private DefaultWindow window; + private String title; + + public AbstractWizardView(String title, P presenter) { + this.presenter = presenter; + this.title = title; + } + + public Widget asWidget() { + deck = new DeckPanel(); + + doAddSteps(deck); + + deck.showWidget(0); + + return deck; + } + + /** + * @param deck2 + */ + protected abstract void doAddSteps(DeckPanel deck); + + /** + * Lunch this wizard. + */ + public void lunch() { + window = new DefaultWindow(Console.MESSAGES.createTitle(this.title)); + window.setWidth(480); + window.setHeight(450); + + window.setWidget(this.asWidget()); + + window.setGlassEnabled(true); + window.center(); + } + + /** + * + * Callback method called when the user wants to close/cancel the wizard. + * + */ + public void onClose() { + window.hide(); + } + + public P getPresenter() { + return this.presenter; + } + +} Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/EditableFederationDetails.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/EditableFederationDetails.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/EditableFederationDetails.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -41,7 +41,7 @@ /** * This class defines the widget to be displayed when a federation instance is selected. * - * @author Pedro Silva + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> * @since Mar 14, 2012 */ public class EditableFederationDetails { Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationDetails.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationDetails.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationDetails.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -25,13 +25,21 @@ import org.jboss.as.console.client.shared.help.FormHelpPanel; import org.jboss.as.console.client.shared.subsys.Baseadress; import org.jboss.as.console.client.shared.viewframework.builder.FormLayout; +import org.jboss.as.console.client.widgets.ContentDescription; +import org.jboss.ballroom.client.widgets.ContentGroupLabel; import org.jboss.ballroom.client.widgets.forms.Form; +import org.jboss.ballroom.client.widgets.forms.TextBoxItem; import org.jboss.ballroom.client.widgets.forms.TextItem; import org.jboss.ballroom.client.widgets.tools.ToolButton; +import org.jboss.ballroom.client.widgets.tools.ToolStrip; import org.jboss.dmr.client.ModelNode; import org.picketlink.as.console.client.shared.subsys.model.Federation; +import org.picketlink.as.console.client.shared.subsys.model.TrustDomain; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.cellview.client.CellTable; +import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; @@ -46,13 +54,15 @@ public class FederationDetails { private Form<Federation> form; + private Form<TrustDomain> trustDomainForm; + private TrustDomainTable trustDomainTable; private FederationPresenter presenter; - private ToolButton disableBtn; - public FederationDetails(FederationPresenter presenter) { + public FederationDetails(CellTable<Federation> table, FederationPresenter presenter) { + this.form = new Form<Federation>(Federation.class); + this.form.setNumColumns(2); + this.form.bind(table); this.presenter = presenter; - form = new Form(Federation.class); - form.setNumColumns(2); } public Widget asWidget() { @@ -65,8 +75,68 @@ form.setEnabled(false); - Widget formWidget = form.asWidget(); + final FormHelpPanel helpPanel = createHelpPanel(); + + detailPanel.add(new FormLayout().setHelp(helpPanel).setForm(form).build()); + VerticalPanel trustDomainsHeader = new VerticalPanel(); + + trustDomainsHeader.setStyleName("fill-layout-width"); + + trustDomainsHeader.add(new ContentGroupLabel("Trusted Domains")); + + this.trustDomainForm = new Form<TrustDomain>(TrustDomain.class); + + this.trustDomainForm.setFields(new TextBoxItem("name", "Name")); + + trustDomainsHeader.add(this.trustDomainForm.asWidget()); + + ToolStrip trustDomainTools = new ToolStrip(); + + ToolButton addTrustedDomainBtn = new ToolButton("Add"); + + addTrustedDomainBtn.addClickHandler(new ClickHandler() { + + @Override + public void onClick(ClickEvent event) { + presenter.onCreateTrustDomain(trustDomainForm.getUpdatedEntity()); + } + }); + + trustDomainTools.addToolButtonRight(addTrustedDomainBtn); + + ToolButton removeTrustedDomainBtn = new ToolButton("Remove"); + + removeTrustedDomainBtn.addClickHandler(new ClickHandler() { + + @Override + public void onClick(ClickEvent event) { + presenter.onRemoveTrustDomain(getTrustDomainTable().getSelectedTrustedDomain()); + } + }); + + trustDomainTools.addToolButtonRight(removeTrustedDomainBtn); + + trustDomainTools.setStyleName("fill-layout-width"); + + trustDomainsHeader.add(trustDomainTools); + + trustDomainsHeader.add(new ContentDescription("")); + + detailPanel.add(trustDomainsHeader); + detailPanel.add(getTrustDomainTable().asWidget()); + + return detailPanel; + } + + /** + * + * Creates a instance of {@link FormHelpPanel} to show descriptions about the federation. + * + * + * @return + */ + private FormHelpPanel createHelpPanel() { final FormHelpPanel helpPanel = new FormHelpPanel(new FormHelpPanel.AddressCallback() { @Override public ModelNode getAddress() { @@ -76,22 +146,16 @@ return address; } }, form); - - detailPanel.add(formWidget); - - return new FormLayout().setHelp(helpPanel).setForm(form).build(); + + return helpPanel; } + + public TrustDomainTable getTrustDomainTable() { + if (this.trustDomainTable == null) { + this.trustDomainTable = new TrustDomainTable(); + } - public void bind(CellTable<Federation> dataSourceTable) { - form.bind(dataSourceTable); + return this.trustDomainTable; } - public void setEnabled(boolean b) { - form.setEnabled(b); - } - - public Federation getCurrentSelection() { - return form.getEditedEntity(); - } - } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationEditor.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationEditor.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationEditor.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -25,26 +25,22 @@ import java.util.List; import org.jboss.as.console.client.Console; -import org.jboss.as.console.client.shared.subsys.jca.DataSourcePresenter; -import org.jboss.as.console.client.shared.subsys.jca.wizard.NewDatasourceWizard; import org.jboss.as.console.client.widgets.ContentDescription; import org.jboss.ballroom.client.widgets.ContentGroupLabel; import org.jboss.ballroom.client.widgets.ContentHeaderLabel; import org.jboss.ballroom.client.widgets.tools.ToolButton; import org.jboss.ballroom.client.widgets.tools.ToolStrip; -import org.jboss.ballroom.client.widgets.window.DefaultWindow; import org.jboss.ballroom.client.widgets.window.Feedback; -import org.picketlink.as.console.client.BeanFactory; import org.picketlink.as.console.client.shared.subsys.model.Federation; import org.picketlink.as.console.client.shared.subsys.model.IdentityProvider; import org.picketlink.as.console.client.shared.subsys.model.ServiceProvider; +import org.picketlink.as.console.client.shared.subsys.model.TrustDomain; import com.google.gwt.dom.client.Style; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.LayoutPanel; import com.google.gwt.user.client.ui.ScrollPanel; -import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.TabPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; @@ -64,35 +60,34 @@ */ public class FederationEditor { - /** - * - */ private static final String EDITOR_DESCRIPTION = "The PicketLink Federation provides the configurations for IDPs and SPs given a federation configuration."; - private static final String EDITOR_LABEL_TEXT = "Federation"; private FederationPresenter presenter; - private FederationTable federationTable; private FederationDetails federationDetails; - private IdentityProviderDetails identityProviderDetails; - private ServiceProviderDetails serviceProviderDetails; - private DefaultWindow window; + private WizardView newFederationWizard; - private BeanFactory beanFactory; + private FederationTable federationTable; - public FederationEditor(FederationPresenter presenter, BeanFactory beanFactory) { + public FederationEditor(FederationPresenter presenter) { this.presenter = presenter; - this.beanFactory = beanFactory; } + /** + * + * Creates the widget for this component. + * + * + * @return + */ public Widget asWidget() { LayoutPanel layout = new LayoutPanel(); VerticalPanel vpanel = new VerticalPanel(); - + vpanel.setStyleName("rhs-content-panel"); ScrollPanel scroll = new ScrollPanel(vpanel); @@ -120,7 +115,7 @@ */ private void addSelectionWidgets(VerticalPanel vpanel) { vpanel.add(new ContentGroupLabel(Console.CONSTANTS.common_label_selection())); - + TabPanel bottomPanel = new TabPanel(); bottomPanel.setStyleName("default-tabpanel"); @@ -128,9 +123,8 @@ bottomPanel.add(getFederationDetails().asWidget(), "General"); bottomPanel.add(getIdentityProvidersDetails().asWidget(), "Identity Provider"); bottomPanel.add(getServiceProviderDetails().asWidget(), "Service Providers"); - bottomPanel.add(new SimplePanel(), "Digital Certificates"); bottomPanel.selectTab(0); - + addSelectionChangeHandler(); vpanel.add(bottomPanel); @@ -141,7 +135,7 @@ */ private ServiceProviderDetails getServiceProviderDetails() { if (this.serviceProviderDetails == null) { - this.serviceProviderDetails = new ServiceProviderDetails(); + this.serviceProviderDetails = new ServiceProviderDetails(this.presenter); } return this.serviceProviderDetails; @@ -149,18 +143,17 @@ /** * - * Adds a {@link SelectionChangeEvent.Handler} to handle selection from the table. - * This method must be called after the <code>addSelectionWidgets</code>. + * Adds a {@link SelectionChangeEvent.Handler} to handle selection from the table. This method must be called after the + * <code>addSelectionWidgets</code>. * */ private void addSelectionChangeHandler() { - SingleSelectionModel<Federation> selectionModel = (SingleSelectionModel<Federation>) this.getFederationTable() - .getCellTable().getSelectionModel(); + SingleSelectionModel<Federation> selectionModel = getCurrentFederation(); selectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { + @SuppressWarnings("unchecked") @Override public void onSelectionChange(SelectionChangeEvent event) { - getFederationDetails().setEnabled(false); presenter.loadIdentityProvider(((SingleSelectionModel<Federation>) event.getSource()).getSelectedObject()); presenter.loadServiceProviders(((SingleSelectionModel<Federation>) event.getSource()).getSelectedObject()); } @@ -168,8 +161,25 @@ } /** - * Adds the widgtes related with the table from which items can be selected, addes or removed. + * Returns the selected federation instance from the table. * + * @return + */ + @SuppressWarnings("unchecked") + public SingleSelectionModel<Federation> getCurrentFederation() { + SingleSelectionModel<Federation> selectionModel = (SingleSelectionModel<Federation>) this.getFederationTable() + .getCellTable().getSelectionModel(); + + if (selectionModel.getSelectedObject() == null && !this.getFederationTable().getDataProvider().getList().isEmpty()) { + selectionModel.setSelected(this.getFederationTable().getDataProvider().getList().get(0), true); + } + + return selectionModel; + } + + /** + * Adds the widgtes related with the table from which items can be selected, added or removed. + * * @param vpanel */ private void addTableWidgets(VerticalPanel vpanel) { @@ -181,11 +191,9 @@ /** * @return */ - @SuppressWarnings("unchecked") private FederationDetails getFederationDetails() { if (this.federationDetails == null) { - this.federationDetails = new FederationDetails(this.presenter); - this.federationDetails.bind(getFederationTable().getCellTable()); + this.federationDetails = new FederationDetails(getFederationTable().getCellTable(), this.presenter); } return this.federationDetails; @@ -203,6 +211,11 @@ } /** + * + * Creates the top level actions that can be used to maintain the federation table items. + * Basically add and remove federation instances. + * + * * @return */ private ToolStrip createTopLevelActions() { @@ -210,7 +223,7 @@ topLevelTools.addToolButtonRight(createAddFederationButton()); topLevelTools.addToolButtonRight(createDeleteFederationButton()); - + return topLevelTools; } @@ -226,24 +239,11 @@ @Override public void onClick(ClickEvent event) { - lunchNewFederationWizard(); + getNewFederationWizard().lunch(); } }); } - private void lunchNewFederationWizard() { - window = new DefaultWindow(Console.MESSAGES.createTitle("Federation")); - window.setWidth(480); - window.setHeight(450); - - window.setWidget( - new NewFederationWizard(this.presenter, this).asWidget() - ); - - window.setGlassEnabled(true); - window.center(); - } - /** * * Creates a instance of {@link ToolButton} to delete federation instances from the table. @@ -256,7 +256,7 @@ @Override public void onClick(ClickEvent event) { - final Federation currentSelection = getFederationDetails().getCurrentSelection(); + final Federation currentSelection = getCurrentFederation().getSelectedObject(); if (currentSelection != null) { Feedback.confirm(Console.MESSAGES.deleteTitle(EDITOR_LABEL_TEXT), @@ -265,7 +265,7 @@ @Override public void onConfirmation(boolean isConfirmed) { if (isConfirmed) { - presenter.onDelete(currentSelection); + presenter.onRemoveFederation(currentSelection); } } }); @@ -281,29 +281,22 @@ } /** - * Updates the table wich the federation instances are listed. + * + * Updates the table from which the federation instances are listed. + * * * @param datasources */ public void updateFederations(List<Federation> datasources) { - getFederationTable().getDataProvider().setList(datasources); + getFederationTable().setList(datasources); getFederationTable().getCellTable().selectDefaultEntity(); } /** - * Returns a instance of the table to be used to show the federation instances. + * + * Updates the informations about a identity provider for a selected federation instance. + * * - * @return - */ - private FederationTable getFederationTable() { - if (this.federationTable == null) { - this.federationTable = new FederationTable(); - } - - return this.federationTable; - } - - /** * @param identityProviders */ public void updateIdentityProviders(List<IdentityProvider> identityProviders) { @@ -311,23 +304,58 @@ } /** + * + * Updates the informations about service providers for a selected federation instance. + * + * * @param result */ public void updateServiceProviders(List<ServiceProvider> result) { this.getServiceProviderDetails().updateServiceProviders(result); } + + /** + * + * Updates the informations about the trusted domains. + * + * + * @param result + */ + public void updateTrustDomains(List<TrustDomain> result) { + this.getFederationDetails().getTrustDomainTable().setList(result); + getFederationDetails().getTrustDomainTable().getCellTable().selectDefaultEntity(); + } + /** + * Returns a instance of the table used to show the federation instances. * + * @return */ - public void closeDialogue() { - window.hide(); + private FederationTable getFederationTable() { + if (this.federationTable == null) { + this.federationTable = new FederationTable(); + } + + return this.federationTable; } /** - * @return the beanFactory + * @return the newFederationWizard */ - public BeanFactory getBeanFactory() { - return this.beanFactory; + public WizardView getNewFederationWizard() { + if (this.newFederationWizard == null) { + this.newFederationWizard = new NewFederationWizard(this.presenter); + } + + return this.newFederationWizard; } + + /** + * @return + */ + public IdentityProvider getIdentityProvider() { + return this.getIdentityProvidersDetails().getIdentityProvider(); + } + } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationPresenter.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationPresenter.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationPresenter.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -21,20 +21,33 @@ */ package org.picketlink.as.console.client.ui.federation; +import java.util.Collections; import java.util.List; +import java.util.Map; +import org.jboss.as.console.client.Console; +import org.jboss.as.console.client.domain.model.ServerGroupRecord; import org.jboss.as.console.client.domain.model.SimpleCallback; +import org.jboss.as.console.client.shared.deployment.DeployCommandExecutor; +import org.jboss.as.console.client.shared.dispatch.impl.DMRResponse; +import org.jboss.as.console.client.shared.model.DeploymentRecord; +import org.jboss.as.console.client.shared.model.DeploymentStore; +import org.jboss.as.console.client.shared.model.ResponseWrapper; import org.jboss.as.console.client.shared.subsys.RevealStrategy; import org.jboss.ballroom.client.layout.LHSHighlightEvent; +import org.jboss.ballroom.client.widgets.window.Feedback; +import org.jboss.dmr.client.ModelNode; import org.picketlink.as.console.client.BeanFactory; import org.picketlink.as.console.client.NameTokens; import org.picketlink.as.console.client.shared.subsys.model.Federation; import org.picketlink.as.console.client.shared.subsys.model.FederationStore; import org.picketlink.as.console.client.shared.subsys.model.IdentityProvider; import org.picketlink.as.console.client.shared.subsys.model.ServiceProvider; +import org.picketlink.as.console.client.shared.subsys.model.TrustDomain; import com.google.gwt.core.client.Scheduler; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.PopupPanel; import com.google.inject.Inject; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; @@ -52,30 +65,56 @@ * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> * @since 03/01/2011 */ -public class FederationPresenter extends Presenter<FederationPresenter.MyView, FederationPresenter.MyProxy> { +public class FederationPresenter extends Presenter<FederationPresenter.MyView, FederationPresenter.MyProxy> implements DeployCommandExecutor { public interface MyView extends View { void setPresenter(FederationPresenter presenter); - + /** * * Updates the view with federations instances configured in the subsystem. * + * * @param federations */ void updateFederations(List<Federation> federations); /** - * Updates the view with the informations about a identity provider. + * + * Updates the view with informations about a identity provider. + * * - * @param result + * @param identityProviders */ - void updateIdentityProviders(List<IdentityProvider> result); + void updateIdentityProviders(List<IdentityProvider> identityProviders); /** + * + * Updates the view with informations about service providers. + * + * + * @param serviceProviders + */ + void updateServiceProviders(List<ServiceProvider> serviceProviders); + + /** + * + * Returns the current selected federation instance. + * + * + * @return + */ + Federation getCurrentFederation(); + + /** + * @return + */ + IdentityProvider getIdentityProvider(); + + /** * @param result */ - void updateServiceProviders(List<ServiceProvider> result); + void updateTrustDomains(List<TrustDomain> result); } @ProxyCodeSplit @@ -84,19 +123,25 @@ } private final RevealStrategy revealStrategy; - private FederationStore federationStore; - private BeanFactory beanFactory; + private final FederationStore federationStore; + private final DeploymentStore deploymentStore; + private final BeanFactory beanFactory; + private List<DeploymentRecord> availableDeployments; @Inject public FederationPresenter(final EventBus eventBus, BeanFactory beanFactory, final MyView view, final MyProxy proxy, - final PlaceManager placeManager, RevealStrategy revealStrategy, FederationStore federationStore) { + final PlaceManager placeManager, RevealStrategy revealStrategy, FederationStore federationStore, + DeploymentStore deploymentStore) { super(eventBus, view, proxy); this.revealStrategy = revealStrategy; this.federationStore = federationStore; + this.deploymentStore = deploymentStore; this.beanFactory = beanFactory; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see com.gwtplatform.mvp.client.PresenterWidget#onReveal() */ @Override @@ -110,7 +155,9 @@ }); } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see com.gwtplatform.mvp.client.Presenter#revealInParent() */ @Override @@ -118,16 +165,21 @@ this.revealStrategy.revealInParent(this); } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see com.gwtplatform.mvp.client.HandlerContainerImpl#onBind() */ @Override protected void onBind() { super.onBind(); + loadDeployments(); getView().setPresenter(this); } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see com.gwtplatform.mvp.client.PresenterWidget#onReset() */ @Override @@ -137,6 +189,13 @@ } /** + * @return the availableDeployments + */ + public List<DeploymentRecord> getAvailableDeployments() { + return this.availableDeployments; + } + + /** * * Loads the federation instances from the subsystem. * @@ -146,10 +205,22 @@ @Override public void onSuccess(List<Federation> result) { getView().updateFederations(result); + loadIdentityProvider(getView().getCurrentFederation()); } }); } - + + public void loadDeployments() { + // load deployments + deploymentStore.loadDeploymentContent(new SimpleCallback<List<DeploymentRecord>>() { + + @Override + public void onSuccess(List<DeploymentRecord> result) { + availableDeployments = result; + } + }); + } + /** * * Loads the federation instances from the subsystem. @@ -160,11 +231,16 @@ @Override public void onSuccess(List<IdentityProvider> result) { getView().updateIdentityProviders(result); + loadTrustDomain(); } }); } - + /** + * + * Loads the service providers instances from the subsystem, given a selected federation instance. + * + * * @param federation */ public void loadServiceProviders(Federation federation) { @@ -175,22 +251,112 @@ } }); } + + /** + * + * Loads the service providers instances from the subsystem, given a selected federation instance. + * + * + * @param federation + */ + public void loadTrustDomain() { + if (getView().getIdentityProvider() != null) { + this.federationStore.loadTrustDomains(getView().getCurrentFederation(), getView().getIdentityProvider(), new SimpleCallback<List<TrustDomain>>() { + @Override + public void onSuccess(List<TrustDomain> result) { + getView().updateTrustDomains(result); + } + }); + } else { + getView().updateTrustDomains(Collections.EMPTY_LIST); + } + } - /** - * @param currentSelection + * + * Creates the given federation instance in the subsystem. + * + * + * @param federation */ - public void onDelete(Federation currentSelection) { - // TODO: on delete federation + public void onCreateFederation(final Federation federation) { + this.federationStore.createFederation(federation, new SimpleCallback<ResponseWrapper<Boolean>>() { + + @Override + public void onSuccess(ResponseWrapper<Boolean> result) { + if (result.getUnderlying()) { + Console.info(Console.MESSAGES.added("Federation ") + federation.getAlias()); + loadFederations(); + } else + Console.error(Console.MESSAGES.addingFailed("Federation " + federation.getAlias()), result.getResponse() + .toString()); + } + }); } /** + * + * Removes the selected federation instance from the subsystem. + * + * + * @param federation + */ + public void onRemoveFederation(final Federation federation) { + this.federationStore.deleteFederation(federation, new SimpleCallback<Boolean>() { + @Override + public void onSuccess(Boolean success) { + + if (success) { + Console.info(Console.MESSAGES.deleted("Federation ") + federation.getAlias()); + } else { + Console.error(Console.MESSAGES.deletionFailed("Federation ") + federation.getAlias()); + } + + loadFederations(); + } + }); + } + + /** * @param updatedEntity */ - public void onCreateFederation(Federation updatedEntity) { - + public void onRemoveTrustDomain(final TrustDomain trustDomain) { + this.federationStore.deleteTrustDomain(getView().getCurrentFederation(), getView().getIdentityProvider(), trustDomain, new SimpleCallback<Boolean>() { + @Override + public void onSuccess(Boolean success) { + + if (success) { + Console.info(Console.MESSAGES.deleted("Trusted Domain ") + trustDomain.getName()); + } else { + Console.error(Console.MESSAGES.deletionFailed("Trusted Domain ") + trustDomain.getName()); + } + + loadFederations(); + } + }); } + + /** + * @param serviceProvider + */ + public void onRemoveServiceProvider(final ServiceProvider serviceProvider) { + this.federationStore.deleteServiceProvider(getView().getCurrentFederation(), serviceProvider, new SimpleCallback<Boolean>() { + @Override + public void onSuccess(Boolean success) { + if (success) { + Console.info(Console.MESSAGES.deleted("Service Provider ") + serviceProvider.getAlias()); + } else { + Console.error(Console.MESSAGES.deletionFailed("Service Provider ") + serviceProvider.getAlias()); + } + + loadFederations(); + } + }); + this.restartServiceProvider(serviceProvider); + } + + /** * @return */ @@ -198,4 +364,208 @@ return this.beanFactory; } + /** + * + * Creates an identity provider instance fiven a federation. + * + * + * @param changeset + */ + public void onCreateIdentityProvider(final IdentityProvider identityProvider) { + this.federationStore.createIdentityProvider(this.getView().getCurrentFederation(), identityProvider, + new SimpleCallback<ResponseWrapper<Boolean>>() { + + @Override + public void onSuccess(ResponseWrapper<Boolean> result) { + if (result.getUnderlying()) { + Console.info(Console.MESSAGES.added("Identity Provider ") + identityProvider.getAlias()); + loadFederations(); + } else + Console.error(Console.MESSAGES.addingFailed("Identity Provider " + identityProvider.getAlias()), + result.getResponse().toString()); + } + }); + this.restartIdentityProvider(identityProvider); + } + + /** + * + * Updates an identity provider instance fiven a federation. + * + * + * @param changedValues + */ + public void onUpdateIdentityProvider(final IdentityProvider identityProvider, final Map<String, Object> changedValues) { + if (changedValues.size() > 0) { + this.federationStore.updateIdentityProvider(getView().getCurrentFederation(), identityProvider, changedValues, + new SimpleCallback<ResponseWrapper<Boolean>>() { + + @Override + public void onSuccess(ResponseWrapper<Boolean> response) { + if (response.getUnderlying()) + Console.info(Console.MESSAGES.saved("Identity Provider " + identityProvider.getAlias())); + else + Console.error(Console.MESSAGES.saveFailed("Identity Provider ") + identityProvider.getAlias(), + response.getResponse().toString()); + + loadIdentityProvider(getView().getCurrentFederation()); + } + + }); + restartIdentityProvider(identityProvider); + } + } + + /** + * @param serviceProvider + */ + public void onCreateServiceProvider(final ServiceProvider serviceProvider) { + this.federationStore.createServiceProvider(this.getView().getCurrentFederation(), serviceProvider, + new SimpleCallback<ResponseWrapper<Boolean>>() { + + @Override + public void onSuccess(ResponseWrapper<Boolean> result) { + if (result.getUnderlying()) { + Console.info(Console.MESSAGES.added("Service Provider ") + serviceProvider.getAlias()); + loadFederations(); + } else + Console.error(Console.MESSAGES.addingFailed("Service Provider " + serviceProvider.getAlias()), + result.getResponse().toString()); + } + }); + this.restartServiceProvider(serviceProvider); + } + + /** + * @param updatedEntity + */ + public void onCreateTrustDomain(final TrustDomain trustDomain) { + this.federationStore.createTrustDomain(this.getView().getCurrentFederation(), this.getView().getIdentityProvider(), trustDomain, + new SimpleCallback<ResponseWrapper<Boolean>>() { + + @Override + public void onSuccess(ResponseWrapper<Boolean> result) { + if (result.getUnderlying()) { + Console.info(Console.MESSAGES.added("Trust Domain ") + trustDomain.getName()); + loadFederations(); + } else + Console.error(Console.MESSAGES.addingFailed("Trust Domain " + trustDomain.getName()), + result.getResponse().toString()); + } + }); + loadTrustDomain(); + restartIdentityProvider(getView().getIdentityProvider()); + } + + + public void restartIdentityProvider(IdentityProvider identityProvider) { + identityProvider.setName(identityProvider.getAlias()); + identityProvider.setRuntimeName(identityProvider.getAlias()); + + this.enableDisableDeployment(identityProvider); + } + + public void restartServiceProvider(ServiceProvider serviceProvider) { + serviceProvider.setName(serviceProvider.getAlias()); + serviceProvider.setRuntimeName(serviceProvider.getAlias()); + + this.enableDisableDeployment(serviceProvider); + } + + public void enableDisableDeployment(final DeploymentRecord record) { + + final PopupPanel loading = Feedback.loading( + Console.CONSTANTS.common_label_plaseWait(), + Console.CONSTANTS.common_label_requestProcessed(), + new Feedback.LoadingCallback() { + @Override + public void onCancel() { + + } + }); + + record.setEnabled(true); + + deploymentStore.enableDisableDeployment(record, new SimpleCallback<DMRResponse>() { + + @Override + public void onSuccess(DMRResponse response) { + loading.hide(); + + ModelNode result = response.get(); + + if(result.isFailure()) + { + Console.error(Console.MESSAGES.modificationFailed("Deployment "+record.getRuntimeName()), result.getFailureDescription()); + } + else + { + Console.info(Console.MESSAGES.modified("Deployment "+record.getRuntimeName())); + } + } + }); + + record.setEnabled(false); + + deploymentStore.enableDisableDeployment(record, new SimpleCallback<DMRResponse>() { + + @Override + public void onSuccess(DMRResponse response) { + loading.hide(); + + ModelNode result = response.get(); + + if(result.isFailure()) + { + Console.error(Console.MESSAGES.modificationFailed("Deployment "+record.getRuntimeName()), result.getFailureDescription()); + } + else + { + Console.info(Console.MESSAGES.modified("Deployment "+record.getRuntimeName())); + } + } + }); + + } + + /* (non-Javadoc) + * @see org.jboss.as.console.client.shared.deployment.DeployCommandExecutor#addToServerGroup(org.jboss.as.console.client.shared.model.DeploymentRecord, boolean, java.lang.String[]) + */ + @Override + public void addToServerGroup(DeploymentRecord record, boolean enable, String... selectedGroups) { + + } + + /* (non-Javadoc) + * @see org.jboss.as.console.client.shared.deployment.DeployCommandExecutor#getPossibleGroupAssignments(org.jboss.as.console.client.shared.model.DeploymentRecord) + */ + @Override + public List<ServerGroupRecord> getPossibleGroupAssignments(DeploymentRecord record) { + return null; + } + + /* (non-Javadoc) + * @see org.jboss.as.console.client.shared.deployment.DeployCommandExecutor#promptForGroupSelections(org.jboss.as.console.client.shared.model.DeploymentRecord) + */ + @Override + public void promptForGroupSelections(DeploymentRecord record) { + + } + + /* (non-Javadoc) + * @see org.jboss.as.console.client.shared.deployment.DeployCommandExecutor#removeContent(org.jboss.as.console.client.shared.model.DeploymentRecord) + */ + @Override + public void removeContent(DeploymentRecord record) { + + } + + /* (non-Javadoc) + * @see org.jboss.as.console.client.shared.deployment.DeployCommandExecutor#removeDeploymentFromGroup(org.jboss.as.console.client.shared.model.DeploymentRecord) + */ + @Override + public void removeDeploymentFromGroup(DeploymentRecord record) { + + } + } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationTable.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationTable.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationTable.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -22,15 +22,17 @@ package org.picketlink.as.console.client.ui.federation; -import org.jboss.ballroom.client.widgets.tables.DefaultCellTable; +import java.util.List; + import org.picketlink.as.console.client.shared.subsys.model.Federation; +import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.TextColumn; /** * This class defines the widget to be displayed for the table of federations. * - * @author Pedro Silva + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> * @since Mar 14, 2012 */public class FederationTable extends AbstractModelElementTable<Federation> { @@ -45,8 +47,9 @@ /* (non-Javadoc) * @see org.picketlink.as.console.client.ui.federation.AbstractModelElementTable#doAddConlumns(org.jboss.ballroom.client.widgets.tables.DefaultCellTable) */ + @SuppressWarnings("unchecked") @Override - protected void doAddConlumns(DefaultCellTable<Federation> federationTable) { + protected void doAddConlumns(CellTable federationTable) { TextColumn<Federation> aliasColumn = new TextColumn<Federation>() { @Override public String getValue(Federation record) { @@ -56,4 +59,5 @@ federationTable.addColumn(aliasColumn, "Name"); } + } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationView.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationView.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/FederationView.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -29,6 +29,7 @@ import org.picketlink.as.console.client.shared.subsys.model.Federation; import org.picketlink.as.console.client.shared.subsys.model.IdentityProvider; import org.picketlink.as.console.client.shared.subsys.model.ServiceProvider; +import org.picketlink.as.console.client.shared.subsys.model.TrustDomain; import com.google.gwt.dom.client.Style; import com.google.gwt.user.client.ui.Widget; @@ -45,28 +46,43 @@ private FederationPresenter presenter; private FederationEditor federationEditor; - + /* (non-Javadoc) * @see org.jboss.as.console.client.core.SuspendableView#createWidget() */ @Override public Widget createWidget() { - this.federationEditor = new FederationEditor(presenter, this.presenter.getBeanFactory()); DefaultTabLayoutPanel tabLayoutpanel = new DefaultTabLayoutPanel(40, Style.Unit.PX); tabLayoutpanel.addStyleName("default-tabpanel"); - tabLayoutpanel.add(federationEditor.asWidget(), "PicketLink Federation", true); + tabLayoutpanel.add(getFederationEditor().asWidget(), "PicketLink Federation", true); tabLayoutpanel.selectTab(0); return tabLayoutpanel; } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.FederationPresenter.MyView#getCurrentFederation() + */ + @Override + public Federation getCurrentFederation() { + return this.getFederationEditor().getCurrentFederation().getSelectedObject(); + } /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.FederationPresenter.MyView#getIdentityProvider() + */ + @Override + public IdentityProvider getIdentityProvider() { + return this.getFederationEditor().getIdentityProvider(); + } + + /* (non-Javadoc) * @see org.picketlink.as.console.client.ui.federation.FederationPresenter.MyView#updateFederations(java.util.List) */ @Override public void updateFederations(List<Federation> federations) { - this.federationEditor.updateFederations(federations); + getFederationEditor().updateFederations(federations); } /* (non-Javadoc) @@ -74,7 +90,7 @@ */ @Override public void updateIdentityProviders(List<IdentityProvider> federations) { - this.federationEditor.updateIdentityProviders(federations); + getFederationEditor().updateIdentityProviders(federations); } /* (non-Javadoc) @@ -82,10 +98,18 @@ */ @Override public void updateServiceProviders(List<ServiceProvider> result) { - this.federationEditor.updateServiceProviders(result); + getFederationEditor().updateServiceProviders(result); } - + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.FederationPresenter.MyView#updateTrustDomains(java.util.List) + */ + @Override + public void updateTrustDomains(List<TrustDomain> result) { + getFederationEditor().updateTrustDomains(result); + } + + /* (non-Javadoc) * @see org.picketlink.as.console.client.ui.federation.FederationPresenter.MyView#setPresenter(org.picketlink.as.console.client.ui.federation.FederationPresenter) */ @Override @@ -93,4 +117,15 @@ this.presenter = presenter; } + /** + * @return + */ + private FederationEditor getFederationEditor() { + if (this.federationEditor == null) { + this.federationEditor = new FederationEditor(presenter); + } + + return this.federationEditor; + } + } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/IdentityProviderDetails.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/IdentityProviderDetails.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/IdentityProviderDetails.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -24,13 +24,18 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.jboss.as.console.client.shared.subsys.Baseadress; +import org.jboss.ballroom.client.widgets.forms.CheckBoxItem; +import org.jboss.ballroom.client.widgets.forms.ComboBoxItem; import org.jboss.ballroom.client.widgets.forms.FormItem; -import org.jboss.ballroom.client.widgets.forms.TextItem; +import org.jboss.ballroom.client.widgets.forms.TextBoxItem; import org.jboss.dmr.client.ModelNode; import org.picketlink.as.console.client.shared.subsys.model.IdentityProvider; +import com.google.gwt.core.client.GWT; + /** * * This class defines the widget to that renders a read-only form for the informations about a Identity Provider. @@ -41,18 +46,36 @@ */ public class IdentityProviderDetails extends AbstractFederationDetails<IdentityProvider> { + private FederationPresenter presenter; + private IdentityProvider identityProvider; + List<FormItem<?>> items; + public IdentityProviderDetails(FederationPresenter presenter) { super(); + this.presenter = presenter; } protected List<FormItem<?>> getFormItems() { - List<FormItem<?>> items = new ArrayList<FormItem<?>>(); + items = new ArrayList<FormItem<?>>(); - items.add(new TextItem("alias", "Alias")); - items.add(new TextItem("url", "Identity URL")); - items.add(new TextItem("signOutgoingMessages", "Sign Outgoing Messages")); - items.add(new TextItem("ignoreIncomingSignatures", "Ignore Incoming Signatures")); + ComboBoxItem aliasesItem = new ComboBoxItem("alias", "Alias"); + aliasesItem.setRequired(true); + + String[] aliases = new String[this.presenter.getAvailableDeployments().size()]; + + for (int i = 0; i < this.presenter.getAvailableDeployments().size(); i++) { + aliases[i] = this.presenter.getAvailableDeployments().get(i).getName(); + } + + aliasesItem.setValueMap(aliases); + + + items.add(aliasesItem); + items.add(new TextBoxItem("url", "Identity URL", true)); + items.add(new CheckBoxItem("signOutgoingMessages", "Sign Outgoing Messages")); + items.add(new CheckBoxItem("ignoreIncomingSignatures", "Ignore Incoming Signatures")); + return items; } @@ -84,8 +107,78 @@ * @param identityProviders */ public void updateIdentityProvider(List<IdentityProvider> identityProviders) { - setEntityInstance(identityProviders.get(0)); - getForm().edit(identityProviders.get(0)); + if (!identityProviders.isEmpty()) { + this.identityProvider = identityProviders.get(0); + setEntityInstance(this.identityProvider); + getForm().edit(identityProviders.get(0)); + } else { + this.identityProvider = null; + getForm().clearValues(); + + IdentityProvider as = this.presenter.getBeanFactory().identityProvider().as(); + + as.setUrl(getBaseUrl() + "/CONTEXT"); + as.setIgnoreIncomingSignatures(false); + as.setSignOutgoingMessages(false); + + getForm().edit(as); + } } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.AbstractFederationDetails#doOnSave(java.util.Map) + */ + @Override + protected void doOnSave(Map<String, Object> changeset) { + if (this.identityProvider == null) { + this.presenter.onCreateIdentityProvider(this.getForm().getUpdatedEntity()); + } else { + this.presenter.onUpdateIdentityProvider(this.identityProvider, changeset); + } + } + + private String getBaseUrl() { + // extract host + String base = GWT.getHostPageBaseURL(); + return extractHttpEndpointUrl(base); + } + + public static String extractHttpEndpointUrl(String base) { + String protocol = base.substring(0, base.indexOf("//")+2); + String remainder = base.substring(base.indexOf(protocol)+protocol.length(), base.length()); + + String host = null; + String port = null; + + int portDelim = remainder.indexOf(":"); + if(portDelim !=-1 ) + { + host = remainder.substring(0, portDelim); + String portRemainder = remainder.substring(portDelim+1, remainder.length()); + if(portRemainder.indexOf("/")!=-1) + { + port = portRemainder.substring(0, portRemainder.indexOf("/")); + } + else + { + port = portRemainder; + } + } + else + { + host = remainder.substring(0, remainder.indexOf("/")); + port = "80"; + } + + // default url + return protocol + host + ":" + port + "/"; + } + + /** + * @return the identityProvider + */ + public IdentityProvider getIdentityProvider() { + return identityProvider; + } } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewFederationWizard.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewFederationWizard.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewFederationWizard.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -25,62 +25,37 @@ import org.picketlink.as.console.client.shared.subsys.model.Federation; import com.google.gwt.user.client.ui.DeckPanel; -import com.google.gwt.user.client.ui.Widget; /** + * + * A wizard to be used when creating a new federation configuration. + * + * * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> * @since Mar 19, 2012 */ -public class NewFederationWizard { +public class NewFederationWizard extends AbstractWizardView<FederationPresenter, Federation> { - private FederationPresenter presenter; - - private DeckPanel deck; - - - private Federation baseAttributes = null; - - private FederationEditor editor; - - public NewFederationWizard( - FederationPresenter presenter, FederationEditor editor) { - this.presenter = presenter; - this.editor = editor; + public NewFederationWizard(FederationPresenter presenter) { + super("Federation", presenter); } - public Widget asWidget() { - deck = new DeckPanel(); - - deck.add(new NewFederationWizardStep1(this, this.editor.getBeanFactory()).asWidget()); - - deck.showWidget(0); - - return deck; + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.AbstractWizardView#doAddSteps(com.google.gwt.user.client.ui.DeckPanel) + */ + @Override + protected void doAddSteps(DeckPanel deck) { + deck.add(new NewFederationWizardStep1(this).asWidget()); } - public FederationPresenter getPresenter() { - return presenter; - } - - public void onFinish(Federation updatedEntity) { - - // merge previous attributes into single entity - updatedEntity.setAlias(baseAttributes.getAlias()); - - presenter.onCreateFederation(updatedEntity); - } - /** - * @param updatedEntity + * + * Callback method called when the user wants to save a new federation instance. + * + * + * @param newFederation */ - public void onConfigureBaseAttributes(Federation updatedEntity) { - this.presenter.onCreateFederation(updatedEntity); + public void onSave(Federation newFederation) { + this.getPresenter().onCreateFederation(newFederation); } - - /** - * @return the editor - */ - public FederationEditor getEditor() { - return this.editor; - } } Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewFederationWizardStep1.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewFederationWizardStep1.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewFederationWizardStep1.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -22,103 +22,43 @@ package org.picketlink.as.console.client.ui.federation; -import org.jboss.as.console.client.Console; -import org.jboss.as.console.client.shared.help.FormHelpPanel; import org.jboss.as.console.client.shared.subsys.Baseadress; -import org.jboss.as.console.client.shared.subsys.jca.model.DataSource; -import org.jboss.as.console.client.shared.subsys.jca.wizard.NewDatasourceWizard; -import org.jboss.as.console.client.widgets.forms.items.JndiNameItem; import org.jboss.ballroom.client.widgets.forms.Form; -import org.jboss.ballroom.client.widgets.forms.FormValidation; import org.jboss.ballroom.client.widgets.forms.TextBoxItem; -import org.jboss.ballroom.client.widgets.window.DialogueOptions; -import org.jboss.ballroom.client.widgets.window.WindowContentBuilder; import org.jboss.dmr.client.ModelNode; -import org.picketlink.as.console.client.BeanFactory; import org.picketlink.as.console.client.shared.subsys.model.Federation; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; - /** + * + * The first step during the wizard to create a new federation instance. + * + * * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> * @since Mar 19, 2012 */ -public class NewFederationWizardStep1 { +public class NewFederationWizardStep1 extends AbstractWizardStep<Federation> { - NewFederationWizard wizard; - private BeanFactory beanFactory; - public NewFederationWizardStep1(NewFederationWizard wizard) { - this.wizard = wizard; + super("New Federation", wizard, Federation.class); } - /** - * @param newFederationWizard - * @param beanFactory + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.AbstractWizardStep#doAddFormItems(org.jboss.ballroom.client.widgets.forms.Form) */ - public NewFederationWizardStep1(NewFederationWizard newFederationWizard, BeanFactory beanFactory) { - this.beanFactory = beanFactory; + @Override + protected void doAddFormItems(Form<Federation> form) { + addFormItem(new TextBoxItem("alias", "Alias")); } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.AbstractWizardStep#doGetHelpAddress() + */ + protected ModelNode doGetHelpAddress() { + ModelNode address = Baseadress.get(); + address.add("subsystem", "picketlink"); + address.add("federation", "*"); + return address; + } - Widget asWidget() { - VerticalPanel layout = new VerticalPanel(); - layout.setStyleName("window-content"); - - layout.add(new HTML("<h3>New Federation</h3>")); - - final Form<Federation> form = new Form<Federation>(Federation.class); - - final TextBoxItem name = new TextBoxItem("alias", "Alias"); - - form.setFields(name); - - form.edit(this.beanFactory.federation().as()); - - final FormHelpPanel helpPanel = new FormHelpPanel( - new FormHelpPanel.AddressCallback() { - @Override - public ModelNode getAddress() { - ModelNode address = Baseadress.get(); - address.add("subsystem", "picketlink"); - address.add("federation", "*"); - return address; - } - }, form - ); - - layout.add(helpPanel.asWidget()); - - layout.add(form.asWidget()); - - ClickHandler submitHandler = new ClickHandler() { - @Override - public void onClick(ClickEvent event) { - FormValidation validation = form.validate(); - if(!validation.hasErrors()) - { - wizard.onConfigureBaseAttributes(form.getUpdatedEntity()); - } - } - }; - - ClickHandler cancelHandler = new ClickHandler() { - @Override - public void onClick(ClickEvent event) { - wizard.getEditor().closeDialogue(); - } - }; - - DialogueOptions options = new DialogueOptions( - Console.CONSTANTS.common_label_save(),submitHandler, - Console.CONSTANTS.common_label_cancel(),cancelHandler - ); - - return new WindowContentBuilder(layout, options).build(); - } - -} +} \ No newline at end of file Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewServiceProviderWizard.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewServiceProviderWizard.java (rev 0) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewServiceProviderWizard.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.as.console.client.ui.federation; + +import org.picketlink.as.console.client.shared.subsys.model.ServiceProvider; + +import com.google.gwt.user.client.ui.DeckPanel; + +/** + * + * A wizard to be used when creating a new service provider configuration. + * + * + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 19, 2012 + */ +public class NewServiceProviderWizard extends AbstractWizardView<FederationPresenter, ServiceProvider>{ + + private NewServiceProviderWizardStep1 newServiceProviderWizardStep1; + + public NewServiceProviderWizard( + FederationPresenter presenter) { + super("Service Provider", presenter); + } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.AbstractWizardView#doAddSteps(com.google.gwt.user.client.ui.DeckPanel) + */ + @Override + protected void doAddSteps(DeckPanel deck) { + deck.add(new NewServiceProviderWizardStep1(this, this.getPresenter()).asWidget()); + } + + /** + * @return + */ + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.WizardView#onSave(java.lang.Object) + */ + @Override + public void onSave(ServiceProvider updatedEntity) { + this.getPresenter().onCreateServiceProvider(updatedEntity); + } + +} Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewServiceProviderWizardStep1.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewServiceProviderWizardStep1.java (rev 0) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/NewServiceProviderWizardStep1.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.as.console.client.ui.federation; + +import java.util.List; + +import org.jboss.as.console.client.shared.model.DeploymentRecord; +import org.jboss.as.console.client.shared.subsys.Baseadress; +import org.jboss.ballroom.client.widgets.forms.CheckBoxItem; +import org.jboss.ballroom.client.widgets.forms.ComboBoxItem; +import org.jboss.ballroom.client.widgets.forms.Form; +import org.jboss.ballroom.client.widgets.forms.TextBoxItem; +import org.jboss.dmr.client.ModelNode; +import org.picketlink.as.console.client.shared.subsys.model.ServiceProvider; + +/** + * + * The first step during the wizard to create a new federation instance. + * + * + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 19, 2012 + */ +public class NewServiceProviderWizardStep1 extends AbstractWizardStep<ServiceProvider> { + + private List<DeploymentRecord> deployments; + private FederationPresenter presenter; + + public NewServiceProviderWizardStep1(NewServiceProviderWizard wizard, FederationPresenter presenter) { + super("New Service Provider", wizard, ServiceProvider.class); + this.presenter = presenter; + } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.AbstractWizardStep#doAddFormItems(org.jboss.ballroom.client.widgets.forms.Form) + */ + @Override + protected void doAddFormItems(Form<ServiceProvider> form) { + ComboBoxItem aliasesItem = new ComboBoxItem("alias", "Alias"); + + aliasesItem.setRequired(true); + + String[] aliases = new String[this.presenter.getAvailableDeployments().size()]; + + for (int i = 0; i < this.presenter.getAvailableDeployments().size(); i++) { + aliases[i] = this.presenter.getAvailableDeployments().get(i).getName(); + } + + aliasesItem.setValueMap(aliases); + + addFormItem(aliasesItem); + addFormItem(new TextBoxItem("url", "URL")); + addFormItem(new CheckBoxItem("postBinding", "HTTP-Post Binding")); + } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.AbstractWizardStep#doGetHelpAddress() + */ + protected ModelNode doGetHelpAddress() { + ModelNode address = Baseadress.get(); + address.add("subsystem", "picketlink"); + address.add("federation", "*"); + address.add("service-provider", "*"); + return address; + } + +} Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderDetails.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderDetails.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderDetails.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -25,8 +25,12 @@ import java.util.List; import org.jboss.as.console.client.widgets.ContentDescription; +import org.jboss.ballroom.client.widgets.tools.ToolButton; +import org.jboss.ballroom.client.widgets.tools.ToolStrip; import org.picketlink.as.console.client.shared.subsys.model.ServiceProvider; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; @@ -42,20 +46,58 @@ public class ServiceProviderDetails { private ServiceProviderTable serviceProviderTable; + private FederationPresenter presenter; + private NewServiceProviderWizard serviceProviderWizard; + public ServiceProviderDetails(FederationPresenter presenter) { + this.presenter = presenter; + } + public Widget asWidget() { VerticalPanel layout = new VerticalPanel(); layout.setStyleName("rhs-content-panel"); - HorizontalPanel horizontalPanel = new HorizontalPanel(); +// HorizontalPanel horizontalPanel = new HorizontalPanel(); +// +// horizontalPanel.setHeight("10px"); +// +// layout.add(horizontalPanel); - horizontalPanel.setHeight("10px"); + ToolStrip trustDomainTools = new ToolStrip(); - layout.add(horizontalPanel); - layout.add(new ContentDescription("Avaiable Service Providers")); - layout.add(getFederationTable().asWidget()); + trustDomainTools.setStyleName("fill-layout-width"); + ToolButton editBtn = new ToolButton("Add"); + + editBtn.addClickHandler(new ClickHandler() { + + @Override + public void onClick(ClickEvent event) { + getServiceProviderWizard().lunch(); + } + }); + + trustDomainTools.add(editBtn); + + ToolButton removeBtn = new ToolButton("Remove"); + + removeBtn.addClickHandler(new ClickHandler() { + + @Override + public void onClick(ClickEvent event) { + presenter.onRemoveServiceProvider(getServiceProviderTable().getSelectedServiceProvider()); + } + }); + + trustDomainTools.add(removeBtn); + + layout.add(trustDomainTools); + + layout.add(new ContentDescription("")); + + layout.add(getServiceProviderTable().asWidget()); + return layout; } @@ -64,9 +106,9 @@ * * @return */ - private ServiceProviderTable getFederationTable() { + private ServiceProviderTable getServiceProviderTable() { if (this.serviceProviderTable == null) { - this.serviceProviderTable = new ServiceProviderTable(); + this.serviceProviderTable = new ServiceProviderTable(this.presenter); } return this.serviceProviderTable; @@ -76,7 +118,15 @@ * @param result */ public void updateServiceProviders(List<ServiceProvider> result) { - this.getFederationTable().getDataProvider().setList(result); + this.getServiceProviderTable().setList(result); } + + public NewServiceProviderWizard getServiceProviderWizard() { + if (this.serviceProviderWizard == null) { + this.serviceProviderWizard = new NewServiceProviderWizard(this.presenter); + } + return this.serviceProviderWizard; + } + } Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderRestartColumn.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderRestartColumn.java (rev 0) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderRestartColumn.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.as.console.client.ui.federation; + +import org.jboss.as.console.client.shared.deployment.DeployCommandExecutor; +import org.jboss.as.console.client.shared.deployment.DeploymentCommand; +import org.jboss.as.console.client.shared.deployment.DeploymentCommandCell; +import org.jboss.as.console.client.shared.model.DeploymentRecord; +import org.picketlink.as.console.client.shared.subsys.model.ServiceProvider; + +import com.google.gwt.user.cellview.client.Column; + +/** + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 23, 2012 + */ +public class ServiceProviderRestartColumn extends Column<DeploymentRecord, DeploymentRecord> { + + public ServiceProviderRestartColumn(DeployCommandExecutor executor, DeploymentCommand command) { + super(new DeploymentCommandCell(executor, command)); + } + + /* (non-Javadoc) + * @see com.google.gwt.user.cellview.client.Column#getValue(java.lang.Object) + */ + @Override + public DeploymentRecord getValue(DeploymentRecord object) { + return object; + } + +} Modified: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderTable.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderTable.java 2012-03-26 21:53:57 UTC (rev 1540) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/ServiceProviderTable.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -22,17 +22,33 @@ package org.picketlink.as.console.client.ui.federation; -import org.jboss.ballroom.client.widgets.tables.DefaultCellTable; +import java.util.List; + import org.picketlink.as.console.client.shared.subsys.model.ServiceProvider; +import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.TextColumn; +import com.google.gwt.view.client.SelectionChangeEvent; +import com.google.gwt.view.client.SelectionChangeEvent.Handler; +import com.google.gwt.view.client.SingleSelectionModel; /** + * + * A table widget to be used to show service providers. + * + * * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> * @since Mar 19, 2012 */ public class ServiceProviderTable extends AbstractModelElementTable<ServiceProvider> { + private FederationPresenter presenter; + private ServiceProvider selectedServiceProvider; + + public ServiceProviderTable(FederationPresenter presenter) { + this.presenter = presenter; + } + /* * (non-Javadoc) * @@ -50,8 +66,9 @@ * org.picketlink.as.console.client.ui.federation.AbstractModelElementTable#doAddConlumns(org.jboss.ballroom.client.widgets * .tables.DefaultCellTable) */ + @SuppressWarnings("unchecked") @Override - protected void doAddConlumns(DefaultCellTable<ServiceProvider> federationTable) { + protected void doAddConlumns(CellTable federationTable) { TextColumn<ServiceProvider> aliasColumn = new TextColumn<ServiceProvider>() { @Override public String getValue(ServiceProvider record) { @@ -60,6 +77,53 @@ }; federationTable.addColumn(aliasColumn, "Name"); + + TextColumn<ServiceProvider> urlColumn = new TextColumn<ServiceProvider>() { + @Override + public String getValue(ServiceProvider record) { + return record.getUrl(); + } + }; + + federationTable.addColumn(aliasColumn, "URL"); + + final SingleSelectionModel<ServiceProvider> selectionModel = new SingleSelectionModel<ServiceProvider>(); + + Handler selectionHandler = new SelectionChangeEvent.Handler() { + + @Override + public void onSelectionChange(com.google.gwt.view.client.SelectionChangeEvent event) { + SingleSelectionModel<ServiceProvider> selection = (SingleSelectionModel<ServiceProvider>) event.getSource(); + + selectedServiceProvider = selection.getSelectedObject(); + } + + }; + + selectionModel.addSelectionChangeHandler(selectionHandler); + // cellTable.setSelectionEnabled(true); + this.getCellTable().setSelectionModel(selectionModel); } + + /* (non-Javadoc) + * @see org.picketlink.as.console.client.ui.federation.AbstractModelElementTable#setList(java.util.List) + */ + @Override + public void setList(List<ServiceProvider> items) { + for (ServiceProvider serviceProvider : items) { + serviceProvider.setName(serviceProvider.getAlias()); + serviceProvider.setRuntimeName(serviceProvider.getRuntimeName()); + serviceProvider.setEnabled(true); + } + + super.setList(items); + } + + /** + * @return the selectedServiceProvider + */ + public ServiceProvider getSelectedServiceProvider() { + return selectedServiceProvider; + } } Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/TrustDomainTable.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/TrustDomainTable.java (rev 0) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/TrustDomainTable.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -0,0 +1,101 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.as.console.client.ui.federation; + +import org.picketlink.as.console.client.shared.subsys.model.TrustDomain; + +import com.google.gwt.user.cellview.client.CellTable; +import com.google.gwt.user.cellview.client.TextColumn; +import com.google.gwt.view.client.SelectionChangeEvent; +import com.google.gwt.view.client.SelectionChangeEvent.Handler; +import com.google.gwt.view.client.SingleSelectionModel; + +/** + * + * A table widget to be used to show service providers. + * + * + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 19, 2012 + */ +public class TrustDomainTable extends AbstractModelElementTable<TrustDomain> { + + private TrustDomain selectedTrustedDomain; + + public TrustDomainTable() { + } + + /* + * (non-Javadoc) + * + * @see org.picketlink.as.console.client.ui.federation.AbstractModelElementTable#doGetKey(java.lang.Object) + */ + @Override + protected Object doGetKey(TrustDomain item) { + return item.getName(); + } + + /* + * (non-Javadoc) + * + * @see + * org.picketlink.as.console.client.ui.federation.AbstractModelElementTable#doAddConlumns(org.jboss.ballroom.client.widgets + * .tables.DefaultCellTable) + */ + @SuppressWarnings("unchecked") + @Override + protected void doAddConlumns(CellTable table) { + TextColumn<TrustDomain> nameColumn = new TextColumn<TrustDomain>() { + @Override + public String getValue(TrustDomain record) { + return record.getName(); + } + }; + + table.addColumn(nameColumn, "Name"); + + final SingleSelectionModel<TrustDomain> selectionModel = new SingleSelectionModel<TrustDomain>(); + + Handler selectionHandler = new SelectionChangeEvent.Handler() { + + @Override + public void onSelectionChange(com.google.gwt.view.client.SelectionChangeEvent event) { + SingleSelectionModel<TrustDomain> selection = (SingleSelectionModel<TrustDomain>) event.getSource(); + + selectedTrustedDomain = selection.getSelectedObject(); + } + + }; + + selectionModel.addSelectionChangeHandler(selectionHandler); + // cellTable.setSelectionEnabled(true); + this.getCellTable().setSelectionModel(selectionModel); + } + + /** + * @return the selectedTrustedDomain + */ + public TrustDomain getSelectedTrustedDomain() { + return selectedTrustedDomain; + } +} Added: console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/WizardView.java =================================================================== --- console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/WizardView.java (rev 0) +++ console/trunk/gui/src/main/java/org/picketlink/as/console/client/ui/federation/WizardView.java 2012-03-26 21:55:14 UTC (rev 1541) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.as.console.client.ui.federation; + +import com.gwtplatform.mvp.client.Presenter; + +/** + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 23, 2012 + */ +public interface WizardView { + + /** + * + * Lunchs the wizard. + * + */ + void lunch(); + + /** + * @param updatedEntity + */ + void onSave(T updatedEntity); + + /** + * + */ + void onClose(); + +}

12 years, 6 months

1
0
0 / 0

Picketlink SVN: r1540 - in console/trunk/app/src/main: java/org/jboss and 9 other directories.

by picketlink-commits＠lists.jboss.org

Author: pcraveiro Date: 2012-03-26 17:53:57 -0400 (Mon, 26 Mar 2012) New Revision: 1540 Added: console/trunk/app/src/main/java/org/jboss/ console/trunk/app/src/main/java/org/jboss/as/ console/trunk/app/src/main/java/org/jboss/as/console/ console/trunk/app/src/main/java/org/jboss/as/console/client/ console/trunk/app/src/main/java/org/jboss/as/console/client/core/ console/trunk/app/src/main/java/org/jboss/as/console/client/core/BootstrapContext.java console/trunk/app/src/main/java/org/jboss/as/console/server/ console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/ console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/HttpClient.java console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/ProxyConfig.java console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/RedirectException.java console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/XmlHttpProxy.java console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/XmlHttpProxyServlet.java console/trunk/app/src/main/resources/gwt-proxy.properties console/trunk/app/src/main/resources/logout.properties console/trunk/app/src/main/resources/upload-proxy.properties Modified: console/trunk/app/src/main/java/org/picketlink/as/console/application/Development.gwt.xml console/trunk/app/src/main/webapp/WEB-INF/web.xml Log: Added more features. Added: console/trunk/app/src/main/java/org/jboss/as/console/client/core/BootstrapContext.java =================================================================== --- console/trunk/app/src/main/java/org/jboss/as/console/client/core/BootstrapContext.java (rev 0) +++ console/trunk/app/src/main/java/org/jboss/as/console/client/core/BootstrapContext.java 2012-03-26 21:53:57 UTC (rev 1540) @@ -0,0 +1,200 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., 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.jboss.as.console.client.core; + +import java.util.HashMap; +import java.util.Map; + +import javax.inject.Inject; + +import org.jboss.as.console.client.shared.Preferences; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.Window; +import com.gwtplatform.mvp.client.proxy.PlaceRequest; + +/** + * @author <a href="mailto:psilva@redhat.com">Pedro Silva</a> + * @since Mar 22, 2012 + */ +public class BootstrapContext implements ApplicationProperties { + + private Map<String,String> ctx = new HashMap<String,String>(); + + private static final String[] persistentProperties = new String[] { + //STANDALONE + }; + private String initialPlace = null; + + @Inject + public BootstrapContext() { + /*String token = History.getToken(); + if(token!=null && !token.equals("") && !token.equals(NameTokens.signInPage)) + setProperty(INITIAL_TOKEN, token); + */ + loadPersistedProperties(); + +// String domainApi = !GWT.isScript() ? getBaseUrl()+"management" : "http://127.0.0.1:8080/picketlink-console-application-1.0.0-SNAPSHOT/app/p..."; +// setProperty(DOMAIN_API, domainApi); +// +// +// String deploymentApi = !GWT.isScript() ? getBaseUrl()+"management/add-content" : "http://127.0.0.1:8080/picketlink-console-application-1.0.0-SNAPSHOT/app/u..."; +// setProperty(DEPLOYMENT_API, deploymentApi); +// +// String logoutApi = !GWT.isScript() ? getBaseUrl()+"logout" : "http://127.0.0.1:8080/picketlink-console-application-1.0.0-SNAPSHOT/app/l..."; +// setProperty(LOGOUT_API, logoutApi); + + String domainApi = GWT.isScript() ? getBaseUrl()+"management" : "http://127.0.0.1:8888/app/proxy"; + setProperty(DOMAIN_API, domainApi); + + + String deploymentApi = GWT.isScript() ? getBaseUrl()+"management/add-content" : "http://127.0.0.1:8888/app/upload"; + setProperty(DEPLOYMENT_API, deploymentApi); + + String logoutApi = GWT.isScript() ? getBaseUrl()+"logout" : "http://127.0.0.1:8888/app/logout"; + setProperty(LOGOUT_API, logoutApi); + + //Log.info("Domain API Endpoint: " + domainApi); + } + + private String getBaseUrl() { + // extract host +// String base = GWT.getHostPageBaseURL(); +// return extractHttpEndpointUrl(base); + return "http://localhost:9990/"; + } + + public static String extractHttpEndpointUrl(String base) { + String protocol = base.substring(0, base.indexOf("//")+2); + String remainder = base.substring(base.indexOf(protocol)+protocol.length(), base.length()); + + String host = null; + String port = null; + + int portDelim = remainder.indexOf(":"); + if(portDelim !=-1 ) + { + host = remainder.substring(0, portDelim); + String portRemainder = remainder.substring(portDelim+1, remainder.length()); + if(portRemainder.indexOf("/")!=-1) + { + port = portRemainder.substring(0, portRemainder.indexOf("/")); + } + else + { + port = portRemainder; + } + } + else + { + host = remainder.substring(0, remainder.indexOf("/")); + port = "80"; + } + + // default url + return protocol + host + ":" + port + "/"; + } + + private void loadPersistedProperties() { + for(String key : persistentProperties) + { + String pref = Preferences.get(key); + if(pref!=null) + setProperty(key, pref); + } + } + + @Override + public void setProperty(String key, String value) + { + if(isPersistent(key)) + Preferences.set(key, value); + + ctx.put(key, value); + } + + @Override + public String getProperty(String key) + { + return ctx.get(key); + } + + @Override + public boolean hasProperty(String key) + { + return getProperty(key)!=null; + } + + public PlaceRequest getDefaultPlace() { + + PlaceRequest defaultPlace = getProperty(STANDALONE).equals("true") ? + new PlaceRequest(NameTokens.StandaloneServerPresenter) : new PlaceRequest(NameTokens.DomainRuntimePresenter); + return defaultPlace; + } + + @Override + public void removeProperty(String key) { + + if(isPersistent(key)) + Preferences.clear(key); + + ctx.remove(key); + } + + boolean isPersistent(String key) + { + boolean b = false; + for(String s : persistentProperties) + { + if(s.equals(key)) + { + b=true; + break; + } + } + + return b; + + } + + @Override + public boolean isStandalone() { + return getProperty(BootstrapContext.STANDALONE).equals("true"); + } + + public void setInitialPlace(String nameToken) { + this.initialPlace = nameToken; + } + + public String getInitialPlace() { + return initialPlace; + } + + public String getLogoutUrl() { + String url = getProperty(LOGOUT_API); + + if(!GWT.isScript()) + url += "?gwt.codesvr=" + Window.Location.getParameter("gwt.codesvr"); + return url; + } +} Added: console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/HttpClient.java =================================================================== --- console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/HttpClient.java (rev 0) +++ console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/HttpClient.java 2012-03-26 21:53:57 UTC (rev 1540) @@ -0,0 +1,361 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * 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, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.jboss.as.console.server.proxy; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.security.Security; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.logging.Logger; + +/** + * @author Yutaka Yoshida, Greg Murray, Heiko Braun + * + * Minimum set of HTTPclient supporting both http and https. + * It's aslo capable of POST, but it doesn't provide doGet because + * the caller can just read the inputstream. + */ +public class HttpClient { + + private static Logger logger; + private String proxyHost = null; + private int proxyPort = -1; + private boolean isHttps = false; + private boolean isProxy = false; + private HttpURLConnection urlConnection = null; + private Map headers; + + private String setCookieHeader; + + private XmlHttpProxy.CookieCallback callback; + + /** + * @param phost PROXY host name + * @param pport PROXY port string + * @param url URL string + * @param headers Map + */ + public HttpClient( + String phost, + int pport, + String url, + Map headers, + String method, + XmlHttpProxy.CookieCallback callback) + throws MalformedURLException + { + this.callback = callback; + + if (phost != null && pport != -1) + { + this.isProxy = true; + } + + this.proxyHost = phost; + this.proxyPort = pport; + + if (url.trim().startsWith("https:")) { + isHttps = true; + } + + this.urlConnection = getURLConnection(url); + try { + this.urlConnection.setRequestMethod(method); + } catch (java.net.ProtocolException pe) { + HttpClient.getLogger().severe("Unable protocol method to " + method + " : " + pe); + } + this.headers = headers; + writeHeaders(headers); + + } + + private void writeHeaders(Map headers) + { + if(this.callback!=null) + { + Map<String, XmlHttpProxy.Cookie> cookies = callback.getCookies(); + Iterator it = cookies.keySet().iterator(); + while(it.hasNext()) + { + XmlHttpProxy.Cookie c = cookies.get(it.next()); + if(headers==null) headers = new HashMap(); + headers.put( + "Cookie", c.name + "=" + c.value // + "; Path=" + c.path + ); + } + + } + // set headers + if (headers != null) { + Iterator it = headers.keySet().iterator(); + if (it != null) { + while (it.hasNext()) { + String key = (String)it.next(); + String value = (String)headers.get(key); + //System.out.println("Set Request Header: "+key + "->"+value); + this.urlConnection.setRequestProperty (key, value); + } + } + } + } + + /** + * @param phost PROXY host name + * @param pport PROXY port string + * @param url URL string + * @param headers Map + * @param userName string + * @param password string + */ + public HttpClient(String phost, + int pport, + String url, + Map headers, + String method, + String userName, + String password, + XmlHttpProxy.CookieCallback callback) + throws MalformedURLException { + + this.callback = callback; + + try + { + if (phost != null && pport != -1) { + this.isProxy = true; + } + + this.proxyHost = phost; + this.proxyPort = pport; + if (url.trim().startsWith("https:")) { + isHttps = true; + } + this.urlConnection = getURLConnection(url); + try { + this.urlConnection.setRequestMethod(method); + } catch (java.net.ProtocolException pe) { + HttpClient.getLogger().severe("Unable protocol method to " + method + " : " + pe); + } + // set basic authentication information + String auth = userName + ":" + password; + String encoded = new sun.misc.BASE64Encoder().encode (auth.getBytes()); + // set basic authorization + this.urlConnection.setRequestProperty ("Authorization", "Basic " + encoded); + this.headers = headers; + writeHeaders(headers); + } catch (Exception ex) { + HttpClient.getLogger().severe("Unable to set basic authorization for " + userName + " : " +ex); + } + } + + /** + * private method to get the URLConnection + * @param str URL string + */ + private HttpURLConnection getURLConnection(String str) + throws MalformedURLException { + try { + + if (isHttps) { + /* when communicating with the server which has unsigned or invalid + * certificate (https), SSLException or IOException is thrown. + * the following line is a hack to avoid that + */ + Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider()); + System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol"); + if (isProxy) { + System.setProperty("https.proxyHost", proxyHost); + System.setProperty("https.proxyPort", proxyPort + ""); + } + } + else + { + if (isProxy) + { + System.setProperty("http.proxyHost", proxyHost); + System.setProperty("http.proxyPort", proxyPort + ""); + } + } + + URL url = new URL(str); + HttpURLConnection uc = (HttpURLConnection)url.openConnection(); + + // if this header has not been set by a request set the user agent. + if (headers == null || + (headers != null && headers.get("user-agent") == null)) { + // set user agent to mimic a common browser + String ua="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322)"; + uc.setRequestProperty("user-agent", ua); + } + + uc.setInstanceFollowRedirects(false); + + return uc; + } + catch (MalformedURLException me) + { + throw new MalformedURLException(str + " is not a valid URL"); + } + catch (Exception e) + { + throw new RuntimeException("Unknown error creating UrlConnection: " + e); + } + } + + public String getSetCookieHeader() + { + return setCookieHeader; + } + + public int getResponseCode() { + try { + return this.urlConnection.getResponseCode(); + } catch (IOException e) { + throw new RuntimeException("No response code", e); + } + } + /** + * returns the inputstream from URLConnection + * @return InputStream + */ + public InputStream getInputStream() { + try + { + int responseCode = this.urlConnection.getResponseCode(); + + try + { + // HACK: manually follow redirects, for the login to work + // HTTPUrlConnection auto redirect doesn't respect the provided headers + if(responseCode ==302) + { + HttpClient redirectClient = + new HttpClient(proxyHost,proxyPort, urlConnection.getHeaderField("Location"), + headers, urlConnection.getRequestMethod(), callback); + redirectClient.getInputStream().close(); + } + } + catch (Throwable e) + { + System.out.println("Following redirect failed"); + } + + setCookieHeader = this.urlConnection.getHeaderField("Set-Cookie"); + + + InputStream in = responseCode != HttpURLConnection.HTTP_OK ? + this.urlConnection.getErrorStream() : this.urlConnection.getInputStream(); + + return in; + } catch (Exception e) { + return null; + } + } + + /** + * return the OutputStream from URLConnection + * @return OutputStream + */ + public OutputStream getOutputStream() { + + try { + return (this.urlConnection.getOutputStream()); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * posts data to the inputstream and returns the InputStream. + * + * @param postData data to be posted. must be url-encoded already. + * @param contentType allows you to set the contentType of the request. + * @param authHeader + * @return InputStream input stream from URLConnection + */ + public InputStream doPost(byte[] postData, String contentType, String authHeader) { + this.urlConnection.setDoOutput(true); + if (contentType != null) this.urlConnection.setRequestProperty( "Content-type", contentType ); + if (authHeader!= null) this.urlConnection.setRequestProperty( "Authorization", authHeader); + + OutputStream out = null; + try { + out = this.getOutputStream(); + if(out!=null) + { + out.write(postData); + out.flush(); + } + } catch (IOException e) { + e.printStackTrace(); + }finally { + if(out!=null) + try { + out.close(); + } catch (IOException e) { + // + } + } + + + return (this.getInputStream()); + } + + public String getContentEncoding() { + if (this.urlConnection == null) return null; + return (this.urlConnection.getContentEncoding()); + } + public int getContentLength() { + if (this.urlConnection == null) return -1; + return (this.urlConnection.getContentLength()); + } + public String getContentType() { + if (this.urlConnection == null) return null; + return (this.urlConnection.getContentType()); + } + public long getDate() { + if (this.urlConnection == null) return -1; + return (this.urlConnection.getDate()); + } + public String getHeader(String name) { + if (this.urlConnection == null) return null; + return (this.urlConnection.getHeaderField(name)); + } + public long getIfModifiedSince() { + if (this.urlConnection == null) return -1; + return (this.urlConnection.getIfModifiedSince()); + } + + public static Logger getLogger() { + if (logger == null) { + logger = Logger.getLogger("jmaki.xhp.Log"); + } + return logger; + } + + +} \ No newline at end of file Added: console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/ProxyConfig.java =================================================================== --- console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/ProxyConfig.java (rev 0) +++ console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/ProxyConfig.java 2012-03-26 21:53:57 UTC (rev 1540) @@ -0,0 +1,88 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * 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, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.jboss.as.console.server.proxy; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.List; +import java.util.Map; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Apr 21, 2010 + */ +public class ProxyConfig +{ + private Map<String,Object> rootConfig; + + public final static String SERVICES = "services"; + public final static String ID = "id"; + public final static String URL = "url"; + public final static String CONTENT_TYPE = "contentType"; + public final static String PASSTHROUGH = "passthrough"; + + protected ProxyConfig(Map<String,Object> rootConfig) + { + this.rootConfig = rootConfig; + } + + private static ProxyConfig parse(String json) + { + /*JSONDecoder decoder = new JSONDecoder(json); + ProxyConfig config = new ProxyConfig((Map<String,Object>)decoder.parse()); + return config; */ + + throw new RuntimeException("Not implemented"); + } + + public static ProxyConfig parse(InputStream in) + { + return parse(inputStreamToString(in)); + } + + public List<Map<String,Object>> getServices() + { + Map<String,Object> root = (Map<String,Object>)rootConfig.get("xhp"); + return (List)root.get(SERVICES); + } + + private static String inputStreamToString(InputStream in) + { + try + { + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(in)); + StringBuilder stringBuilder = new StringBuilder(); + String line = null; + + while ((line = bufferedReader.readLine()) != null) { + stringBuilder.append(line + "\n"); + } + + bufferedReader.close(); + return stringBuilder.toString(); + } + catch (IOException e) + { + throw new RuntimeException("Failed to parse input stream", e); + } + } +} Added: console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/RedirectException.java =================================================================== --- console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/RedirectException.java (rev 0) +++ console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/RedirectException.java 2012-03-26 21:53:57 UTC (rev 1540) @@ -0,0 +1,20 @@ +package org.jboss.as.console.server.proxy; + +import java.io.IOException; + +/** + * @author Heiko Braun + * @date 12/14/11 + */ +public class RedirectException extends IOException { + + String location; + + public RedirectException(String location) { + this.location = location; + } + + public String getLocation() { + return location; + } +} Added: console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/XmlHttpProxy.java =================================================================== --- console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/XmlHttpProxy.java (rev 0) +++ console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/XmlHttpProxy.java 2012-03-26 21:53:57 UTC (rev 1540) @@ -0,0 +1,495 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * 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, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.jboss.as.console.server.proxy; + + +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; + +/** + * @author Greg Murray + * @author Heiko Braun + */ +public class XmlHttpProxy { + + public static String GET = "GET"; + public static String POST = "POST"; + public static String DELETE = "DELETE"; + public static String PUT = "PUT"; + + private String userName = null; + private String password = null; + private static Logger logger; + private String proxyHost = ""; + int proxyPort = -1; + private Object config; + private static String USAGE = "Usage: -url service_URL -id service_key [-url or -id required] -xslurl xsl_url [optional] -format json|xml [optional] -callback[optional] -config [optional] -resources base_directory_containing XSL stylesheets [optional]"; + private String authHeader; + + public XmlHttpProxy() {} + + private String contentType = "application/json"; + + private Map<String, Cookie> cookies = new HashMap<String, Cookie>(); + + int status = -1; + + public String getContentType() { + return contentType; + } + + public int getStatus() { + return status; + } + + public interface CookieCallback + { + Map<String, Cookie> getCookies(); + } + + public XmlHttpProxy(String proxyHost, int proxyPort) { + this.proxyHost = proxyHost; + this.proxyPort = proxyPort; + } + + public XmlHttpProxy(String proxyHost, int proxyPort, + String userName, String password) { + this.proxyHost = proxyHost; + this.proxyPort = proxyPort; + this.userName = userName; + this.password = password; + } + + /** + * This method will go out and make the call and it will apply an XSLT Transformation with the + * set of parameters provided. + * + * @param urlString - The URL which you are looking up + * @param out - The OutputStream to which the resulting document is written + * @param xslInputStream - An input Stream to an XSL style sheet that is provided to the XSLT processor. If set to null there will be no transformation + * @param paramsMap - A Map of parameters that are feed to the XSLT Processor. These params may be used when generating content. This may be set to null if no parameters are necessary. + * @param method - The HTTP method used. + * + */ + public void processRequest(String urlString, + OutputStream out, + InputStream xslInputStream, + Map paramsMap, + Map headers, + String method, + String userName, + String password) throws IOException, MalformedURLException { + doProcess(urlString, out, xslInputStream, paramsMap, headers,method, null,null, userName,password); + } + /** + * This method will go out and make the call and it will apply an XSLT Transformation with the + * set of parameters provided. + * + * @param urlString - The URL which you are looking up + * @param out - The OutputStream to which the resulting document is written + * @param authHeader + * + */ + public void doPost(String urlString, + OutputStream out, + InputStream xslInputStream, + Map paramsMap, + Map headers, + byte[] postData, + String postContentType, + String userName, + String password, String authHeader) throws IOException, MalformedURLException { + this.authHeader = authHeader; + doProcess(urlString, out, xslInputStream, paramsMap, headers, XmlHttpProxy.POST, postData, postContentType, userName, password); + } + + /** + * This method will go out and make the call and it will apply an XSLT Transformation with the + * set of parameters provided. + * + * @param urlString - The URL which you are looking up + * @param out - The OutputStream to which the resulting document is written + * @param xslInputStream - An input Stream to an XSL style sheet that is provided to the XSLT processor. If set to null there will be no transformation + * @param paramsMap - A Map of parameters that are feed to the XSLT Processor. These params may be used when generating content. This may be set to null if no parameters are necessary. + * @param method - the HTTP method used. + * @param postData - A String of the bodyContent to be posted. A doPost will be used if this is parameter is not null. + * @param postContentType - The request contentType used when posting data. Will not be set if this parameter is null. + * @param userName - userName used for basic authorization + * @param password - password used for basic authorization + */ + public void doProcess(String urlString, + OutputStream out, + InputStream xslInputStream, + Map paramsMap, + Map headers, + String method, + byte[] postData, + String postContentType, + String userName, + String password) throws IOException, MalformedURLException { + + if (paramsMap == null) { + paramsMap = new HashMap(); + } + + String format = (String)paramsMap.get("format"); + if (format == null) { + format = "xml"; + } + + InputStream in = null; + BufferedOutputStream os = null; + + HttpClient httpclient = null; + + CookieCallback callback = new CookieCallback() + { + + public Map<String, Cookie> getCookies() + { + return accessCookies(); + } + }; + + if (userName != null && password != null) + { + httpclient = new HttpClient(proxyHost, proxyPort, urlString, headers, method, userName, password, callback); + } + else + { + httpclient = new HttpClient(proxyHost, proxyPort, urlString, headers, method, callback); + } + + // post data determines whether we are going to do a get or a post + if (postData == null) { + in = httpclient.getInputStream(); + } else { + in = httpclient.doPost(postData, postContentType, authHeader); + } + + // Set-Cookie header + if(httpclient.getSetCookieHeader()!=null) + { + String cookie = httpclient.getSetCookieHeader(); + System.out.println("'Set-Cookie' header: "+ cookie); + String[] values = cookie.split(";"); + + Cookie c = new Cookie(); + for(String v : values) + { + String[] tuple = v.split("="); + if("Path".equals( tuple[0].trim())) + c.path = tuple[1]; + else + { + c.name = tuple[0].trim(); + c.value = tuple[1]; + } + } + + + List<String> toBeRemoved = new ArrayList<String>(); + Iterator it = cookies.keySet().iterator(); + while(it.hasNext()) + { + Cookie exists = cookies.get(it.next()); + if(exists.name.equals(c.name)) + { + String msg = exists.value.equals(c.value) ? + "Replace with same value: "+exists.value : + "Replace with different value: "+exists.value +"->"+c.value; + + System.out.println("Cookie '"+exists.name+"' exists: " + msg); + // avoid doubles + toBeRemoved.add(exists.name); + } + } + + // clean up + for(String s : toBeRemoved) + { + cookies.remove(s); + } + + cookies.put(c.name, c); + } + + if(null==in) + { + int responseCode = httpclient.getResponseCode(); + if(401== responseCode || 403==responseCode) + { + // authentication required + throw new AuthenticationException(responseCode, httpclient.getHeader("WWW-Authenticate")); + } + else if(307==responseCode) + { + // redirect + throw new RedirectException(httpclient.getHeader("Location")); + } + else + { + throw new IOException("Failed to open input stream, status: "+responseCode); + } + } + + // read the encoding from the incoming document and default to UTF-8 + // if an encoding is not provided + String ce = httpclient.getContentEncoding(); + if (ce == null) { + String ct = httpclient.getContentType(); + if (ct != null) { + int idx = ct.lastIndexOf("charset="); + if (idx >= 0) { + ce = ct.substring(idx+8); + } else { + ce = "UTF-8"; + } + } else { + ce = "UTF-8"; + } + } + // get the content type + this.contentType = httpclient.getContentType(); + this.status = httpclient.getResponseCode(); + + // write out the content type + //http://www.ietf.org/rfc/rfc4627.txt + + try { + + // response stream + + byte[] buffer = new byte[1024]; + int read = 0; + if (xslInputStream == null) { + while (true) { + read = in.read(buffer); + if (read <= 0) break; + out.write(buffer, 0, read ); + } + } else { + transform(in, xslInputStream, paramsMap, out, ce); + } + } catch (Exception e) { + getLogger().severe("XmlHttpProxy transformation error: " + e); + } finally { + try { + if (in != null) { + in.close(); + } + if (out != null) { + out.flush(); + out.close(); + } + } catch (Exception e) { + // do nothing + } + } + } + + private Map<String,Cookie> accessCookies() + { + return cookies; + } + + /** + * Do the XSLT transformation + */ + public void transform( InputStream xmlIS, + InputStream xslIS, + Map params, + OutputStream result, + String encoding) { + try { + TransformerFactory trFac = TransformerFactory.newInstance(); + Transformer transformer = trFac.newTransformer(new StreamSource(xslIS)); + Iterator it = params.keySet().iterator(); + while (it.hasNext()) { + String key = (String)it.next(); + transformer.setParameter(key, (String)params.get(key)); + } + transformer.setOutputProperty("encoding", encoding); + transformer.transform(new StreamSource(xmlIS), new StreamResult(result)); + } catch (Exception e) { + getLogger().severe("XmlHttpProxy: Exception with xslt " + e); + } + } + + /** + * + * CLI to the XmlHttpProxy + */ + /* public static void main(String[] args) + throws IOException, MalformedURLException { + + getLogger().info("XmlHttpProxy 1.8"); + XmlHttpProxy xhp = new XmlHttpProxy(); + + if (args.length == 0) { + System.out.println(USAGE); + } + + String method = XmlHttpProxy.GET; + InputStream xslInputStream = null; + String serviceKey = null; + String urlString = null; + String xslURLString = null; + String format = "xml"; + String callback = null; + String urlParams = null; + String configURLString = "xhp.json"; + String resourceBase = "file:src/conf/META-INF/resources/xsl/"; + String username = null; + String password = null; + + // read in the arguments + int index = 0; + while (index < args.length) { + if (args[index].toLowerCase().equals("-url") && index + 1 < args.length) { + urlString = args[++index]; + } else if (args[index].toLowerCase().equals("-key") && index + 1 < args.length) { + serviceKey = args[++index]; + } else if (args[index].toLowerCase().equals("-id") && index + 1 < args.length) { + serviceKey = args[++index]; + } else if (args[index].toLowerCase().equals("-callback") && index + 1 < args.length) { + callback = args[++index]; + } else if (args[index].toLowerCase().equals("-xslurl") && index + 1 < args.length) { + xslURLString = args[++index]; + } else if (args[index].toLowerCase().equals("-method") && index + 1 < args.length) { + method = args[++index]; + } else if (args[index].toLowerCase().equals("-username") && index + 1 < args.length) { + username = args[++index]; + } else if (args[index].toLowerCase().equals("-password") && index + 1 < args.length) { + password = args[++index]; + } else if (args[index].toLowerCase().equals("-urlparams") && index + 1 < args.length) { + urlParams = args[++index]; + } else if (args[index].toLowerCase().equals("-config") && index + 1 < args.length) { + configURLString = args[++index]; + } else if (args[index].toLowerCase().equals("-resources") && index + 1 < args.length) { + resourceBase = args[++index]; + } + index++; + } + + if (serviceKey != null) { + try { + InputStream is = (new URL(configURLString)).openStream(); + JSONObject services = loadServices(is); + JSONObject service = services.getJSONObject(serviceKey); + // default to the service default if no url parameters are specified + if (urlParams == null && service.has("defaultURLParams")) { + urlParams = service.getString("defaultURLParams"); + } + String serviceURL = service.getString("url"); + // build the URL properly + if (urlParams != null && serviceURL.indexOf("?") == -1){ + serviceURL += "?"; + } else if (urlParams != null){ + serviceURL += "&"; + } + String apiKey = ""; + if (service.has("apikey")) apiKey = service.getString("apikey"); + urlString = serviceURL + apiKey + "&" + urlParams; + if (service.has("xslStyleSheet")) { + xslURLString = service.getString("xslStyleSheet"); + // check if the url is correct of if to load from the classpath + + } + } catch (Exception ex) { + getLogger().severe("XmlHttpProxy Error loading service: " + ex); + System.exit(1); + } + } else if (urlString == null) { + System.out.println(USAGE); + System.exit(1); + } + // The parameters are feed to the XSL Stylsheet during transformation. + // These parameters can provided data or conditional information. + Map paramsMap = new HashMap(); + if (format != null) { + paramsMap.put("format", format); + } + if (callback != null) { + paramsMap.put("callback", callback); + } + + if (xslURLString != null) { + URL xslURL = new URL(xslURLString); + if (xslURL != null) { + xslInputStream = xslURL.openStream(); + } else { + getLogger().severe("Error: Unable to locate XSL at URL " + xslURLString); + } + } + xhp.processRequest(urlString, System.out, xslInputStream, paramsMap, null, method, username, password); + } */ + + public static Logger getLogger() { + if (logger == null) { + logger = Logger.getLogger(XmlHttpProxy.class.getName()); + } + return logger; + } + + public static ProxyConfig loadServices(InputStream is) + { + return ProxyConfig.parse(is); + } + + public class Cookie + { + String name; + String value; + String path; + } + + + public class AuthenticationException extends IOException { + int code; + String authHeader; + + public AuthenticationException(int code, String authHeader) { + this.code = code; + this.authHeader = authHeader; + } + + public int getCode() { + return code; + } + + public String getAuthHeader() { + return authHeader; + } + } +} \ No newline at end of file Added: console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/XmlHttpProxyServlet.java =================================================================== --- console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/XmlHttpProxyServlet.java (rev 0) +++ console/trunk/app/src/main/java/org/jboss/as/console/server/proxy/XmlHttpProxyServlet.java 2012-03-26 21:53:57 UTC (rev 1540) @@ -0,0 +1,631 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @author tags. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * 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, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.jboss.as.console.server.proxy; + + +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.PropertyResourceBundle; +import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +/** + * Used to access services in hosted mode that + * deployed to an external container. I.e. JBoss AS. + * + * Usage (web.xml): + * + * <pre> + * <servlet> + * <servlet-name>gwtProxy</servlet-name> + * <description>GWT Proxy</description> + * <servlet-class>org.jboss.as.console.server.proxy.XmlHttpProxyServlet</servlet-class> + * <init-param> + * <param-name>config.name</param-name> + * <param-value>gwt-proxy.json</param-value> + * </init-param> + * <load-on-startup>1</load-on-startup> + * </servlet> + * + * <servlet-mapping> + * <servlet-name>gwtProxy</servlet-name> + * <url-pattern>/app/proxy/*</url-pattern> + * </servlet-mapping> + * + * </pre> + * + * + * + * gwt-proxy.properties: + * <pre> + * service.id=domain-api + * service.url=http://127.0.0.1:9990/domain-api + * service.passThrough=true + * </pre> + * + * @author Greg Murray + * @author Heiko Braun + */ +public class XmlHttpProxyServlet extends HttpServlet +{ + + public static String REMOTE_USER = "REMOTE_USER"; + + private static String XHP_LAST_MODIFIED = "xhp_last_modified_key"; + private static String DEFAULT_CONFIG = "gwt-proxy.properties"; + + private static boolean allowXDomain = false; + private static boolean requireSession = false; + private static boolean createSession = false; + private static String defaultContentType = "application/dmr-encoded;charset=UTF-8"; + private static boolean rDebug = false; + private Logger logger = null; + private XmlHttpProxy xhp = null; + private ServletContext ctx; + private List<Map<String,Object>> services = null; + private String resourcesDir = "/resources/"; + private String classpathResourcesDir = "/META-INF/resources/"; + private String headerToken = "jmaki-"; + private String testToken = "xtest-"; + + private static String testUser; + private static String testPass; + + private static String setCookie; + private String configResource = null; + private String authHeader; + + public XmlHttpProxyServlet() { + if (rDebug) { + logger = getLogger(); + } + + } + + public void init(ServletConfig config) throws ServletException { + super.init(config); + ctx = config.getServletContext(); + // set the response content type + if (ctx.getInitParameter("responseContentType") != null) { + defaultContentType = ctx.getInitParameter("responseContentType"); + } + // allow for resources dir over-ride at the xhp level otherwise allow + // for the jmaki level resources + if (ctx.getInitParameter("jmaki-xhp-resources") != null) { + resourcesDir = ctx.getInitParameter("jmaki-xhp-resources"); + } else if (ctx.getInitParameter("jmaki-resources") != null) { + resourcesDir = ctx.getInitParameter("jmaki-resources"); + } + // allow for resources dir over-ride + if (ctx.getInitParameter("jmaki-classpath-resources") != null) { + classpathResourcesDir = ctx.getInitParameter("jmaki-classpath-resources"); + } + String requireSessionString = ctx.getInitParameter("requireSession"); + if (requireSessionString == null) requireSessionString = ctx.getInitParameter("jmaki-requireSession"); + if (requireSessionString != null) { + if ("false".equals(requireSessionString)) { + requireSession = false; + getLogger().severe("XmlHttpProxyServlet: intialization. Session requirement disabled."); + } else if ("true".equals(requireSessionString)) { + requireSession = true; + getLogger().severe("XmlHttpProxyServlet: intialization. Session requirement enabled."); + } + } + String xdomainString = ctx.getInitParameter("allowXDomain"); + if (xdomainString == null) xdomainString = ctx.getInitParameter("jmaki-allowXDomain"); + if (xdomainString != null) { + if ("true".equals(xdomainString)) { + allowXDomain = true; + getLogger().severe("XmlHttpProxyServlet: intialization. xDomain access is enabled."); + } else if ("false".equals(xdomainString)) { + allowXDomain = false; + getLogger().severe("XmlHttpProxyServlet: intialization. xDomain access is disabled."); + } + } + String createSessionString = ctx.getInitParameter("jmaki-createSession"); + if (createSessionString != null) { + if ("true".equals(createSessionString)) { + createSession = true; + getLogger().severe("XmlHttpProxyServlet: intialization. create session is enabled."); + } else if ("false".equals(xdomainString)) { + createSession = false; + getLogger().severe("XmlHttpProxyServlet: intialization. create session is disabled."); + } + } + // if there is a proxyHost and proxyPort specified create an HttpClient with the proxy + String proxyHost = ctx.getInitParameter("proxyHost"); + String proxyPortString = ctx.getInitParameter("proxyPort"); + if (proxyHost != null && proxyPortString != null) { + int proxyPort = 8080; + try { + proxyPort= new Integer(proxyPortString).intValue(); + xhp = new XmlHttpProxy(proxyHost, proxyPort); + } catch (NumberFormatException nfe) { + getLogger().severe("XmlHttpProxyServlet: intialization error. The proxyPort must be a number"); + throw new ServletException("XmlHttpProxyServlet: intialization error. The proxyPort must be a number"); + } + } else { + xhp = new XmlHttpProxy(); + } + + // config override + String servletName = config.getServletName(); + String configName = config.getInitParameter("config.name"); + configResource = configName!=null ? configName : DEFAULT_CONFIG; + //System.out.println("Configure "+servletName + " through "+configResource); + } + + private void getServices(HttpServletResponse res) + { + services = new ArrayList<Map<String,Object>>(); + + InputStream is = XmlHttpProxyServlet.class.getClassLoader() + .getResourceAsStream(configResource); + + if(null==is) + throw new IllegalStateException("Failed to load proxy configuration: "+configResource); + + try { + PropertyResourceBundle bundle = new PropertyResourceBundle(is); + HashMap<String, Object> serviceConfig = new HashMap<String, Object>(); + serviceConfig.put(ProxyConfig.ID, "default"); + serviceConfig.put(ProxyConfig.URL, bundle.getString("service.url")); + serviceConfig.put(ProxyConfig.PASSTHROUGH, Boolean.valueOf(bundle.getString("service.passthrough"))); + services.add(serviceConfig); + + } catch (IOException e) { + throw new RuntimeException("Failed to load proxy configuration"); + + } + + } + + public void doDelete(HttpServletRequest req, HttpServletResponse res) { + doProcess(req,res, XmlHttpProxy.DELETE); + } + + public void doGet(HttpServletRequest req, HttpServletResponse res) { + doProcess(req,res, XmlHttpProxy.GET); + } + + public void doPost(HttpServletRequest req, HttpServletResponse res) { + doProcess(req,res, XmlHttpProxy.POST); + } + + /* (non-Javadoc) + * @see javax.servlet.http.HttpServlet#doOptions(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + @Override + protected void doOptions(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException { + doProcess(arg0,arg1, XmlHttpProxy.POST); + } + + public void doPut(HttpServletRequest req, HttpServletResponse res) { + doProcess(req,res, XmlHttpProxy.PUT); + } + + public void doProcess(HttpServletRequest req, HttpServletResponse res, String method) + { + + boolean isPost = XmlHttpProxy.POST.equals(method); + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + byte[] bodyContent = null; + + OutputStream out = null; + PrintWriter writer = null; + + try { + + BufferedInputStream in = new BufferedInputStream(req.getInputStream()); + int next = in.read(); + while (next > -1) { + bos.write(next); + next = in.read(); + } + + bodyContent = bos.toByteArray(); + + } catch (IOException e) { + e.printStackTrace(); + } + + try + { + HttpSession session = null; + // it really does not make sense to use create session with require session as + // the create session will always result in a session created and the requireSession + // will always succeed. Leaving the logic for now. + if (createSession) { + session = req.getSession(true); + } + if (requireSession) { + // check to see if there was a session created for this request + // if not assume it was from another domain and blow up + // Wrap this to prevent Portlet exeptions + session = req.getSession(false); + if (session == null) { + res.setStatus(HttpServletResponse.SC_FORBIDDEN); + return; + } + } + // check if the services have been loaded or if they need to be reloaded + if (services == null || configUpdated()) { + getServices(res); + } + String urlString = null; + String xslURLString = null; + String userName = null; + String password = null; + String format = "json"; + String callback = req.getParameter("callback"); + String urlParams = req.getParameter("urlparams"); + String countString = req.getParameter("count"); + boolean passthrough = false; + // encode the url to prevent spaces from being passed along + if (urlParams != null) { + urlParams = urlParams.replace(' ', '+'); + } + // get the headers to pass through + Map headers = null; + authHeader = null; + + // Forward all request headers starting with the header token jmaki- + // and chop off the jmaki- + Enumeration hnum = req.getHeaderNames(); + + // test hack + + while (hnum.hasMoreElements()) { + String name = (String)hnum.nextElement(); + if (name.startsWith(headerToken)) + { + if (headers == null) headers = new HashMap(); + + String value = ""; + // handle multi-value headers + Enumeration vnum = req.getHeaders(name); + while (vnum.hasMoreElements()) { + value += (String)vnum.nextElement(); + if (vnum.hasMoreElements()) value += ";"; + } + String sname = name.substring(headerToken.length(), name.length()); + headers.put(sname,value); + } + else if (name.equals("Accept")) + { + if (headers == null) headers = new HashMap(); + + String value = ""; + // handle multi-value headers + Enumeration vnum = req.getHeaders(name); + while (vnum.hasMoreElements()) { + value += (String)vnum.nextElement(); + if (vnum.hasMoreElements()) value += ";"; + } + headers.put(name,value); + } + else if(name.startsWith(testToken)) + { + // hack test capabilities for authentication + if("xtest-user".equals(name)) testUser = req.getHeader("xtest-user"); + if("xtest-pass".equals(name)) testPass = req.getHeader("xtest-pass"); + } + + // auth header + else if(name.equalsIgnoreCase("Authorization")) + { + if (headers == null) { + headers = new HashMap(); + } + // hack test capabilities for authentication + authHeader = req.getHeader("Authorization"); + headers.put("Authorization", authHeader); + } + } + + try + { + String actualServiceKey = "default"; + Map<String,Object> service = null; + for(Map svc : services) + { + if(svc.get(ProxyConfig.ID).equals(actualServiceKey)) + { + service = svc; + break; + } + } + if (service!=null) + { + + String serviceURL = (String)service.get(ProxyConfig.URL); + if(null==serviceURL) + throw new IllegalArgumentException(configResource+": service url is mising"); + + if (service.containsKey(ProxyConfig.PASSTHROUGH)) + passthrough = (Boolean)service.get(ProxyConfig.PASSTHROUGH); + + + if(null==testUser) + { + //System.out.println("Ignore service configuration credentials"); + if (service.containsKey("username")) userName = (String)service.get("username"); + if (service.containsKey("password")) password = (String)service.get("password"); + } + else + { + userName = testUser; + password = testPass; + } + + String apikey = ""; + if (service.containsKey("apikey")) apikey = (String)service.get("apikey"); + if (service.containsKey("xslStyleSheet")) xslURLString = (String)service.get("xslStyleSheet"); + + // default to the service default if no url parameters are specified + if(!passthrough) + { + if (urlParams == null && service.containsKey("defaultURLParams")) { + urlParams = (String)service.get("defaultURLParams"); + } + + // build the URL + if (urlParams != null && serviceURL.indexOf("?") == -1){ + serviceURL += "?"; + } else if (urlParams != null) { + serviceURL += "&"; + } + + urlString = serviceURL + apikey; + if (urlParams != null) urlString += "&" + urlParams; + } + + if(passthrough) + { + StringBuffer sb = new StringBuffer(); + sb.append(serviceURL); + + // override service url and url params + String path = req.getRequestURI(); + String servletPath = req.getServletPath(); + path = path.substring(path.indexOf(servletPath)+servletPath.length(), path.length()); + + StringTokenizer tok = new StringTokenizer(path, "/"); + while(tok.hasMoreTokens()) + { + String token = tok.nextToken(); + if(token.indexOf(";")!=-1) + sb.append("/").append(token); // ;JSESSIONID=XYZ + else + sb.append("/").append(URLEncoder.encode(token)); + } + + if(req.getQueryString()!=null) + sb.append("?").append(req.getQueryString()); + + urlString = sb.toString(); + } + } + else + { + writer = res.getWriter(); + writer.write("XmlHttpProxyServlet Error : service for id '" + actualServiceKey + "' not found."); + writer.flush(); + return; + } + } + catch (Exception ex) + { + getLogger().severe("XmlHttpProxyServlet Error loading service: " + ex); + res.setStatus(500); + } + + Map paramsMap = new HashMap(); + paramsMap.put("format", format); + // do not allow for xdomain unless the context level setting is enabled. + if (callback != null && allowXDomain) { + paramsMap.put("callback", callback); + } + if (countString != null) { + paramsMap.put("count", countString); + } + + InputStream xslInputStream = null; + + if (urlString == null) { + writer = res.getWriter(); + writer.write("XmlHttpProxyServlet parameters: id[Required] urlparams[Optional] format[Optional] callback[Optional]"); + writer.flush(); + return; + } + // support for session properties and also authentication name + if (urlString.indexOf("${") != -1) { + urlString = processURL(urlString, req, res); + } + + out = res.getOutputStream(); + + if (!isPost) + { + xhp.processRequest(urlString, out, xslInputStream, paramsMap, headers, method, userName, password); + } + else + { + if (bodyContent == null) + getLogger().info("XmlHttpProxyServlet attempting to post to url " + urlString + " with no body content"); + xhp.doPost(urlString, out, xslInputStream, paramsMap, headers, bodyContent, req.getContentType(), userName, password, authHeader); + } + + res.setContentType(xhp.getContentType()); + res.setStatus(xhp.getStatus()); + + } + catch (Exception iox) + { + if(iox instanceof XmlHttpProxy.AuthenticationException) + { + XmlHttpProxy.AuthenticationException authEx = (XmlHttpProxy.AuthenticationException)iox; + res.setHeader("WWW-Authenticate", authEx.getAuthHeader()); + res.setStatus(authEx.getCode()); + } + /*else if(iox instanceof RedirectException) + { + RedirectException redirect = (RedirectException)iox; + + String redir = redirect.getLocation(); + if(redir.equals("/")) redir+="App.html"; + redir+="?gwt.codesvr=127.0.0.1:9997"; + + System.out.println(">> "+ redir); + res.setHeader("Location", redir); + res.setStatus(307); + } */ + else + { + iox.printStackTrace(); + getLogger().severe("XmlHttpProxyServlet: caught " + iox); + + res.setStatus(500); + } + /*try { + writer = res.getWriter(); + writer.write("XmlHttpProxyServlet error loading service for " + serviceKey + " . Please notify the administrator."); + writer.flush(); + } catch (java.io.IOException ix) { + ix.printStackTrace(); + }*/ + return; + } + finally + { + try + { + if (out != null) out.close(); + if (writer != null) writer.close(); + } catch (java.io.IOException iox){} + } + } + + /* Allow for a EL style replacements in the serviceURL + * + * The constant REMOTE_USER will replace the contents of ${REMOTE_USER} + * with the return value of request.getRemoteUserver() if it is not null + * otherwise the ${REMOTE_USER} is replaced with a blank. + * + * If you use ${session.somekey} the ${session.somekey} will be replaced with + * the String value of the session varialble somekey or blank if the session key + * does not exist. + * + */ + private String processURL(String url, HttpServletRequest req, HttpServletResponse res) { + String serviceURL = url; + int start = url.indexOf("${"); + int end = url.indexOf("}", start); + if (end != -1) { + String prop = url.substring(start + 2, end).trim(); + // no matter what we will remove the ${} + // default to blank like the JSP EL + String replace = ""; + if (REMOTE_USER.equals(prop)) { + if (req.getRemoteUser() != null) replace = req.getRemoteUser(); + } + if (prop.toLowerCase().startsWith("session.")) { + String sessionKey = prop.substring("session.".length(), prop.length()); + if (req.getSession().getAttribute(sessionKey) != null) { + // force to a string + replace = req.getSession().getAttribute(sessionKey).toString(); + } + } + serviceURL = serviceURL.substring(0, start) + + replace + + serviceURL.substring(end + 1, serviceURL.length()); + } + // call recursively to process more than one instance of a ${ in the serviceURL + if (serviceURL.indexOf("${") != -1) serviceURL = processURL(serviceURL, req, res); + return serviceURL; + } + + /** + * Check to see if the configuration file has been updated so that it may be reloaded. + */ + private boolean configUpdated() { + try { + URL url = ctx.getResource(resourcesDir + configResource); + URLConnection con; + if (url == null) return false ; + con = url.openConnection(); + long lastModified = con.getLastModified(); + long XHP_LAST_MODIFIEDModified = 0; + if (ctx.getAttribute(XHP_LAST_MODIFIED) != null) { + XHP_LAST_MODIFIEDModified = ((Long)ctx.getAttribute(XHP_LAST_MODIFIED)).longValue(); + } else { + ctx.setAttribute(XHP_LAST_MODIFIED, new Long(lastModified)); + return false; + } + if (XHP_LAST_MODIFIEDModified < lastModified) { + ctx.setAttribute(XHP_LAST_MODIFIED, new Long(lastModified)); + return true; + } + } catch (Exception ex) { + getLogger().severe("XmlHttpProxyServlet error checking configuration: " + ex); + } + return false; + } + + public Logger getLogger() { + if (logger == null) { + logger = Logger.getLogger("jmaki.services.xhp.Log"); + + // TODO: the logger breaks the GWT tests, because it writes to stderr + // we'll turn it off for now. + //System.out.println("WARN: XHP proxy logging is turned off"); + logger.setLevel(Level.OFF); + } + return logger; + } + + private void logMessage(String message) { + if (rDebug) { + getLogger().info(message); + } + } +} \ No newline at end of file Modified: console/trunk/app/src/main/java/org/picketlink/as/console/application/Development.gwt.xml =================================================================== --- console/trunk/app/src/main/java/org/picketlink/as/console/application/Development.gwt.xml 2012-03-26 20:35:04 UTC (rev 1539) +++ console/trunk/app/src/main/java/org/picketlink/as/console/application/Development.gwt.xml 2012-03-26 21:53:57 UTC (rev 1540) @@ -21,7 +21,7 @@ <inherits name="org.picketlink.as.console.application.App" /> - <set-property name="user.agent" value="gecko1_8" /> + <set-property name="user.agent" value="safari,gecko1_8" /> <set-property name="locale" value="default" /> </module> Added: console/trunk/app/src/main/resources/gwt-proxy.properties =================================================================== --- console/trunk/app/src/main/resources/gwt-proxy.properties (rev 0) +++ console/trunk/app/src/main/resources/gwt-proxy.properties 2012-03-26 21:53:57 UTC (rev 1540) @@ -0,0 +1,22 @@ +# +# JBoss, Home of Professional Open Source +# Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors +# as indicated by the @author tags. All rights reserved. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU Lesser General Public License, v. 2.1. +# This program is distributed in the hope that it will be useful, but WITHOUT A +# 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, +# v.2.1 along with this distribution; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + +service.id=domain-api +service.url=http://127.0.0.1:9990/management +service.passthrough=true \ No newline at end of file Added: console/trunk/app/src/main/resources/logout.properties =================================================================== --- console/trunk/app/src/main/resources/logout.properties (rev 0) +++ console/trunk/app/src/main/resources/logout.properties 2012-03-26 21:53:57 UTC (rev 1540) @@ -0,0 +1,22 @@ +# +# JBoss, Home of Professional Open Source +# Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors +# as indicated by the @author tags. All rights reserved. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU Lesser General Public License, v. 2.1. +# This program is distributed in the hope that it will be useful, but WITHOUT A +# 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, +# v.2.1 along with this distribution; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + +service.id=logout-api +service.url=http://127.0.0.1:9990/logout +service.passthrough=true \ No newline at end of file Added: console/trunk/app/src/main/resources/upload-proxy.properties =================================================================== --- console/trunk/app/src/main/resources/upload-proxy.properties (rev 0) +++ console/trunk/app/src/main/resources/upload-proxy.properties 2012-03-26 21:53:57 UTC (rev 1540) @@ -0,0 +1,22 @@ +# +# JBoss, Home of Professional Open Source +# Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors +# as indicated by the @author tags. All rights reserved. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU Lesser General Public License, v. 2.1. +# This program is distributed in the hope that it will be useful, but WITHOUT A +# 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, +# v.2.1 along with this distribution; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + +service.id=deployment-api +service.url=http://127.0.0.1:9990/management/add-content +service.passthrough=true \ No newline at end of file Modified: console/trunk/app/src/main/webapp/WEB-INF/web.xml =================================================================== --- console/trunk/app/src/main/webapp/WEB-INF/web.xml 2012-03-26 20:35:04 UTC (rev 1539) +++ console/trunk/app/src/main/webapp/WEB-INF/web.xml 2012-03-26 21:53:57 UTC (rev 1540) @@ -1,38 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee +<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - version="2.5"> + version="2.5"> - <servlet> - <servlet-name>gwtProxy</servlet-name> - <servlet-class>org.jboss.as.console.server.proxy.XmlHttpProxyServlet</servlet-class> - <init-param> - <param-name>config.name</param-name> - <param-value>gwt-proxy.properties</param-value> - </init-param> - <load-on-startup>1</load-on-startup> - </servlet> + <context-param> + <param-name>proxyHost</param-name> + <param-value>localhost</param-value> + </context-param> - <servlet> - <servlet-name>uploadProxy</servlet-name> - <servlet-class>org.jboss.as.console.server.proxy.XmlHttpProxyServlet</servlet-class> - <init-param> - <param-name>config.name</param-name> - <param-value>upload-proxy.properties</param-value> - </init-param> - <load-on-startup>1</load-on-startup> - </servlet> + <context-param> + <param-name>proxyPort</param-name> + <param-value>9990</param-value> + </context-param> - <servlet-mapping> - <servlet-name>gwtProxy</servlet-name> - <url-pattern>/app/proxy/*</url-pattern> - </servlet-mapping> + <servlet> + <servlet-name>gwtProxy</servlet-name> + <servlet-class>org.jboss.as.console.server.proxy.XmlHttpProxyServlet</servlet-class> + <init-param> + <param-name>config.name</param-name> + <param-value>gwt-proxy.properties</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> - <servlet-mapping> - <servlet-name>uploadProxy</servlet-name> - <url-pattern>/app/upload/*</url-pattern> - </servlet-mapping> + <servlet> + <servlet-name>uploadProxy</servlet-name> + <servlet-class>org.jboss.as.console.server.proxy.XmlHttpProxyServlet</servlet-class> + <init-param> + <param-name>config.name</param-name> + <param-value>upload-proxy.properties</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>gwtProxy</servlet-name> + <url-pattern>/app/proxy/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>uploadProxy</servlet-name> + <url-pattern>/app/upload/*</url-pattern> + </servlet-mapping> + +  + </web-app>

12 years, 6 months

1
0
0 / 0

Picketlink SVN: r1539 - in trust/trunk: jbossws and 1 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2012-03-26 16:35:04 -0400 (Mon, 26 Mar 2012) New Revision: 1539 Modified: trust/trunk/jbossws/pom.xml trust/trunk/parent/pom.xml trust/trunk/pom.xml Log: next 2.1 Modified: trust/trunk/jbossws/pom.xml =================================================================== --- trust/trunk/jbossws/pom.xml 2012-03-26 20:34:27 UTC (rev 1538) +++ trust/trunk/jbossws/pom.xml 2012-03-26 20:35:04 UTC (rev 1539) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-trust-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -52,12 +52,12 @@ <dependency> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.picketlink</groupId> <artifactId>picketlink-bindings-jboss</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <exclusions> <exclusion> <artifactId>jboss-security-spi</artifactId> Modified: trust/trunk/parent/pom.xml =================================================================== --- trust/trunk/parent/pom.xml 2012-03-26 20:34:27 UTC (rev 1538) +++ trust/trunk/parent/pom.xml 2012-03-26 20:35:04 UTC (rev 1539) @@ -8,7 +8,7 @@ <groupId>org.picketlink</groupId> <artifactId>picketlink-trust-parent</artifactId> <packaging>pom</packaging> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <name>PicketLink Trust - Parent</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink Trust integrates PicketLink with external projects</description> Modified: trust/trunk/pom.xml =================================================================== --- trust/trunk/pom.xml 2012-03-26 20:34:27 UTC (rev 1538) +++ trust/trunk/pom.xml 2012-03-26 20:35:04 UTC (rev 1539) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-trust-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

12 years, 6 months

1
0
0 / 0

Picketlink SVN: r1538 - trust/tags.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2012-03-26 16:34:27 -0400 (Mon, 26 Mar 2012) New Revision: 1538 Added: trust/tags/2.0.3.Final/ Log: PLFED-273:

12 years, 6 months

1
0
0 / 0

Picketlink SVN: r1537 - in trust/trunk: jbossws and 1 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2012-03-26 16:33:33 -0400 (Mon, 26 Mar 2012) New Revision: 1537 Modified: trust/trunk/jbossws/pom.xml trust/trunk/parent/pom.xml trust/trunk/pom.xml Log: PLFED-273: prepare 2.0.3.Final Modified: trust/trunk/jbossws/pom.xml =================================================================== --- trust/trunk/jbossws/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) +++ trust/trunk/jbossws/pom.xml 2012-03-26 20:33:33 UTC (rev 1537) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-trust-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -52,12 +52,12 @@ <dependency> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> </dependency> <dependency> <groupId>org.picketlink</groupId> <artifactId>picketlink-bindings-jboss</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <exclusions> <exclusion> <artifactId>jboss-security-spi</artifactId> Modified: trust/trunk/parent/pom.xml =================================================================== --- trust/trunk/parent/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) +++ trust/trunk/parent/pom.xml 2012-03-26 20:33:33 UTC (rev 1537) @@ -8,7 +8,7 @@ <groupId>org.picketlink</groupId> <artifactId>picketlink-trust-parent</artifactId> <packaging>pom</packaging> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <name>PicketLink Trust - Parent</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink Trust integrates PicketLink with external projects</description> Modified: trust/trunk/pom.xml =================================================================== --- trust/trunk/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) +++ trust/trunk/pom.xml 2012-03-26 20:33:33 UTC (rev 1537) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-trust-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

12 years, 6 months

1
0
0 / 0

Picketlink SVN: r1536 - in federation/trunk: assembly and 43 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2012-03-23 14:36:20 -0400 (Fri, 23 Mar 2012) New Revision: 1536 Modified: federation/trunk/assembly/pom.xml federation/trunk/parent/pom.xml federation/trunk/picketlink-bindings-jboss/pom.xml federation/trunk/picketlink-bindings/pom.xml federation/trunk/picketlink-fed-api/pom.xml federation/trunk/picketlink-fed-core/pom.xml federation/trunk/picketlink-fed-model/pom.xml federation/trunk/picketlink-web/pom.xml federation/trunk/picketlink-webapps/as7/assembly/pom.xml federation/trunk/picketlink-webapps/as7/employee-post-sig/pom.xml federation/trunk/picketlink-webapps/as7/employee-post/pom.xml federation/trunk/picketlink-webapps/as7/employee-saml11/pom.xml federation/trunk/picketlink-webapps/as7/employee/pom.xml federation/trunk/picketlink-webapps/as7/idp-sig/pom.xml federation/trunk/picketlink-webapps/as7/idp/pom.xml federation/trunk/picketlink-webapps/as7/pdp/pom.xml federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml federation/trunk/picketlink-webapps/as7/pom.xml federation/trunk/picketlink-webapps/as7/sales-post-sig/pom.xml federation/trunk/picketlink-webapps/as7/sales-post/pom.xml federation/trunk/picketlink-webapps/as7/sales-saml11/pom.xml federation/trunk/picketlink-webapps/as7/sales/pom.xml federation/trunk/picketlink-webapps/assembly/pom.xml federation/trunk/picketlink-webapps/circleoftrust/pom.xml federation/trunk/picketlink-webapps/employee-post-sig/pom.xml federation/trunk/picketlink-webapps/employee-post/pom.xml federation/trunk/picketlink-webapps/employee-sig/pom.xml federation/trunk/picketlink-webapps/employee-standalone/pom.xml federation/trunk/picketlink-webapps/employee/pom.xml federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml federation/trunk/picketlink-webapps/idp-sig/pom.xml federation/trunk/picketlink-webapps/idp-standalone/pom.xml federation/trunk/picketlink-webapps/idp/pom.xml federation/trunk/picketlink-webapps/metadata/pom.xml federation/trunk/picketlink-webapps/pdp/pom.xml federation/trunk/picketlink-webapps/picketlink-sts/pom.xml federation/trunk/picketlink-webapps/pom.xml federation/trunk/picketlink-webapps/sales-post-sig/pom.xml federation/trunk/picketlink-webapps/sales-post/pom.xml federation/trunk/picketlink-webapps/sales-saml11/pom.xml federation/trunk/picketlink-webapps/sales-sig/pom.xml federation/trunk/picketlink-webapps/sales-standalone/pom.xml federation/trunk/picketlink-webapps/sales/pom.xml federation/trunk/picketlink-xmlsec-model/pom.xml federation/trunk/pom.xml Log: PLFED-271: next 2.1.0 Modified: federation/trunk/assembly/pom.xml =================================================================== --- federation/trunk/assembly/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/assembly/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/parent/pom.xml =================================================================== --- federation/trunk/parent/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/parent/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -8,7 +8,7 @@ <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> <packaging>pom</packaging> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <name>PicketLink Federation- Parent</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> Modified: federation/trunk/picketlink-bindings/pom.xml =================================================================== --- federation/trunk/picketlink-bindings/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-bindings/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-bindings-jboss/pom.xml =================================================================== --- federation/trunk/picketlink-bindings-jboss/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-bindings-jboss/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-fed-api/pom.xml =================================================================== --- federation/trunk/picketlink-fed-api/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-fed-api/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-fed-core/pom.xml =================================================================== --- federation/trunk/picketlink-fed-core/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-fed-core/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-fed-model/pom.xml =================================================================== --- federation/trunk/picketlink-fed-model/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-fed-model/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-web/pom.xml =================================================================== --- federation/trunk/picketlink-web/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-web/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/as7/assembly/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/assembly/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/assembly/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/as7/employee/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/employee/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/employee/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/employee-post/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/employee-post/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/employee-post/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/employee-post-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/employee-post-sig/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/employee-post-sig/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/employee-saml11/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/employee-saml11/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/employee-saml11/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/idp/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/idp/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/idp/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/idp-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/idp-sig/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/idp-sig/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/pdp/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/pdp/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/pdp/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/as7/sales/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/sales/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/sales/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/sales-post/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/sales-post/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/sales-post/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/sales-post-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/sales-post-sig/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/sales-post-sig/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/sales-saml11/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/sales-saml11/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/as7/sales-saml11/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/assembly/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/assembly/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/assembly/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/circleoftrust/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/circleoftrust/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/circleoftrust/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>circleoftrust</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>PicketLink Federation Circle Of Trust</name> <url>http://labs.jboss.org/portal/picketlink/</url> Modified: federation/trunk/picketlink-webapps/employee/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/employee/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/employee-post/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-post/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/employee-post/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/employee-post-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-post-sig/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/employee-post-sig/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/employee-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-sig/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/employee-sig/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/employee-standalone/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-standalone/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/employee-standalone/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/idp/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/idp/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/idp/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/idp-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/idp-sig/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/idp-sig/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/idp-standalone/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/idp-standalone/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/idp-standalone/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/metadata/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/metadata/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/metadata/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/pdp/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/pdp/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/pdp/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/picketlink-sts/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/picketlink-sts/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/picketlink-sts/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/sales/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/sales/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-post/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-post/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/sales-post/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-post-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-post-sig/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/sales-post-sig/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-saml11/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-saml11/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/sales-saml11/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-sig/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/sales-sig/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-standalone/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-standalone/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-webapps/sales-standalone/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-xmlsec-model/pom.xml =================================================================== --- federation/trunk/picketlink-xmlsec-model/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/picketlink-xmlsec-model/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/pom.xml =================================================================== --- federation/trunk/pom.xml 2012-03-23 18:33:48 UTC (rev 1535) +++ federation/trunk/pom.xml 2012-03-23 18:36:20 UTC (rev 1536) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3.Final</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

12 years, 6 months

1
0
0 / 0

Picketlink SVN: r1535 - federation/tags.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2012-03-23 14:33:48 -0400 (Fri, 23 Mar 2012) New Revision: 1535 Added: federation/tags/2.0.3.Final/ Log: PLFED-273: tag 2.0.3.Final

12 years, 6 months

1
0
0 / 0

Picketlink SVN: r1534 - in federation/trunk: assembly and 43 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2012-03-23 14:31:05 -0400 (Fri, 23 Mar 2012) New Revision: 1534 Modified: federation/trunk/assembly/pom.xml federation/trunk/parent/pom.xml federation/trunk/picketlink-bindings-jboss/pom.xml federation/trunk/picketlink-bindings/pom.xml federation/trunk/picketlink-fed-api/pom.xml federation/trunk/picketlink-fed-core/pom.xml federation/trunk/picketlink-fed-model/pom.xml federation/trunk/picketlink-web/pom.xml federation/trunk/picketlink-webapps/as7/assembly/pom.xml federation/trunk/picketlink-webapps/as7/employee-post-sig/pom.xml federation/trunk/picketlink-webapps/as7/employee-post/pom.xml federation/trunk/picketlink-webapps/as7/employee-saml11/pom.xml federation/trunk/picketlink-webapps/as7/employee/pom.xml federation/trunk/picketlink-webapps/as7/idp-sig/pom.xml federation/trunk/picketlink-webapps/as7/idp/pom.xml federation/trunk/picketlink-webapps/as7/pdp/pom.xml federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml federation/trunk/picketlink-webapps/as7/pom.xml federation/trunk/picketlink-webapps/as7/sales-post-sig/pom.xml federation/trunk/picketlink-webapps/as7/sales-post/pom.xml federation/trunk/picketlink-webapps/as7/sales-saml11/pom.xml federation/trunk/picketlink-webapps/as7/sales/pom.xml federation/trunk/picketlink-webapps/assembly/pom.xml federation/trunk/picketlink-webapps/circleoftrust/pom.xml federation/trunk/picketlink-webapps/employee-post-sig/pom.xml federation/trunk/picketlink-webapps/employee-post/pom.xml federation/trunk/picketlink-webapps/employee-sig/pom.xml federation/trunk/picketlink-webapps/employee-standalone/pom.xml federation/trunk/picketlink-webapps/employee/pom.xml federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml federation/trunk/picketlink-webapps/idp-sig/pom.xml federation/trunk/picketlink-webapps/idp-standalone/pom.xml federation/trunk/picketlink-webapps/idp/pom.xml federation/trunk/picketlink-webapps/metadata/pom.xml federation/trunk/picketlink-webapps/pdp/pom.xml federation/trunk/picketlink-webapps/picketlink-sts/pom.xml federation/trunk/picketlink-webapps/pom.xml federation/trunk/picketlink-webapps/sales-post-sig/pom.xml federation/trunk/picketlink-webapps/sales-post/pom.xml federation/trunk/picketlink-webapps/sales-saml11/pom.xml federation/trunk/picketlink-webapps/sales-sig/pom.xml federation/trunk/picketlink-webapps/sales-standalone/pom.xml federation/trunk/picketlink-webapps/sales/pom.xml federation/trunk/picketlink-xmlsec-model/pom.xml federation/trunk/pom.xml Log: PLFED-271: prepare 2.0.3.Final Modified: federation/trunk/assembly/pom.xml =================================================================== --- federation/trunk/assembly/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/assembly/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/parent/pom.xml =================================================================== --- federation/trunk/parent/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/parent/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -8,7 +8,7 @@ <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> <packaging>pom</packaging> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <name>PicketLink Federation- Parent</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> Modified: federation/trunk/picketlink-bindings/pom.xml =================================================================== --- federation/trunk/picketlink-bindings/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-bindings/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-bindings-jboss/pom.xml =================================================================== --- federation/trunk/picketlink-bindings-jboss/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-bindings-jboss/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-fed-api/pom.xml =================================================================== --- federation/trunk/picketlink-fed-api/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-fed-api/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-fed-core/pom.xml =================================================================== --- federation/trunk/picketlink-fed-core/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-fed-core/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-fed-model/pom.xml =================================================================== --- federation/trunk/picketlink-fed-model/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-fed-model/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-web/pom.xml =================================================================== --- federation/trunk/picketlink-web/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-web/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/as7/assembly/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/assembly/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/assembly/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/as7/employee/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/employee/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/employee/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/employee-post/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/employee-post/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/employee-post/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/employee-post-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/employee-post-sig/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/employee-post-sig/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/employee-saml11/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/employee-saml11/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/employee-saml11/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/idp/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/idp/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/idp/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/idp-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/idp-sig/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/idp-sig/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/pdp/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/pdp/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/pdp/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/as7/sales/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/sales/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/sales/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/sales-post/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/sales-post/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/sales-post/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/sales-post-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/sales-post-sig/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/sales-post-sig/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/as7/sales-saml11/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/sales-saml11/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/as7/sales-saml11/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps-as7</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/assembly/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/assembly/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/assembly/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/circleoftrust/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/circleoftrust/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/circleoftrust/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>circleoftrust</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <packaging>war</packaging> <name>PicketLink Federation Circle Of Trust</name> <url>http://labs.jboss.org/portal/picketlink/</url> Modified: federation/trunk/picketlink-webapps/employee/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/employee/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/employee-post/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-post/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/employee-post/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/employee-post-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-post-sig/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/employee-post-sig/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/employee-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-sig/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/employee-sig/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/employee-standalone/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-standalone/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/employee-standalone/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/idp/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/idp/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/idp/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/idp-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/idp-sig/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/idp-sig/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/idp-standalone/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/idp-standalone/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/idp-standalone/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/metadata/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/metadata/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/metadata/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/pdp/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/pdp/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/pdp/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/picketlink-sts/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/picketlink-sts/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/picketlink-sts/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/picketlink-webapps/sales/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/sales/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-post/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-post/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/sales-post/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-post-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-post-sig/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/sales-post-sig/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-saml11/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-saml11/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/sales-saml11/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-sig/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-sig/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/sales-sig/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-webapps/sales-standalone/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-standalone/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-webapps/sales-standalone/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../</relativePath> </parent> Modified: federation/trunk/picketlink-xmlsec-model/pom.xml =================================================================== --- federation/trunk/picketlink-xmlsec-model/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/picketlink-xmlsec-model/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: federation/trunk/pom.xml =================================================================== --- federation/trunk/pom.xml 2012-03-19 23:53:07 UTC (rev 1533) +++ federation/trunk/pom.xml 2012-03-23 18:31:05 UTC (rev 1534) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.Final</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

12 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits March 2012