[jboss-cvs] JBossAS SVN: r89042 - in branches/Branch_5_x: profileservice/src/main/org/jboss/profileservice/ejb and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 19 08:37:17 EDT 2009
Author: emuckenhuber
Date: 2009-05-19 08:37:16 -0400 (Tue, 19 May 2009)
New Revision: 89042
Modified:
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureDeploymentManager.java
branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/DeploymentManagerImpl.java
branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/SerializableDeploymentID.java
branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/xml/PersistedGenericValue.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ImmutableClusteredDeploymentRepository.java
Log:
JBAS-6693
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-05-19 12:28:25 UTC (rev 89041)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-05-19 12:37:16 UTC (rev 89042)
@@ -73,7 +73,7 @@
<version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
<version.org.jboss.ejb3>1.1.5</version.org.jboss.ejb3>
<version.org.jboss.ejb3.endpoint.deployer>0.1.3</version.org.jboss.ejb3.endpoint.deployer>
- <version.org.jboss.integration>5.1.0.CR4</version.org.jboss.integration>
+ <version.org.jboss.integration>5.1.0.GA</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.2.0.CR3</version.org.jboss.jopr>
<version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureDeploymentManager.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureDeploymentManager.java 2009-05-19 12:28:25 UTC (rev 89041)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/ejb/SecureDeploymentManager.java 2009-05-19 12:37:16 UTC (rev 89042)
@@ -37,6 +37,7 @@
import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
+import org.jboss.profileservice.spi.DeploymentOption;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
@@ -73,6 +74,10 @@
{
return delegate.distribute(name, contentURL, copyContent);
}
+ public DeploymentProgress distribute(String name, URL contentURL, DeploymentOption... options) throws Exception
+ {
+ return delegate.distribute(name, contentURL, options);
+ }
public Collection<ProfileKey> getProfiles()
{
return delegate.getProfiles();
Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/DeploymentManagerImpl.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/DeploymentManagerImpl.java 2009-05-19 12:28:25 UTC (rev 89041)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/DeploymentManagerImpl.java 2009-05-19 12:37:16 UTC (rev 89042)
@@ -35,6 +35,7 @@
import org.jboss.deployers.spi.management.deploy.DeploymentStatus.CommandType;
import org.jboss.logging.Logger;
import org.jboss.profileservice.management.upload.remoting.StreamingDeploymentTarget;
+import org.jboss.profileservice.spi.DeploymentOption;
import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileRepository;
@@ -154,7 +155,32 @@
deployment.setCopyContent(copyContent);
return new DeploymentProgressImpl(targets, deployment, CommandType.DISTRIBUTE);
}
+
+ public DeploymentProgress distribute(String name, URL contentURL, DeploymentOption... options) throws Exception
+ {
+ if(name == null)
+ throw new IllegalArgumentException("Null name.");
+ if(contentURL == null)
+ throw new IllegalArgumentException("Null content url.");
+ if(options == null)
+ options = new DeploymentOption[0];
+ if(getTargetProfile() == null)
+ {
+ formatter.applyPattern(i18n.getString("DeploymentManager.NoProfileLoadedException")); //$NON-NLS-1$
+ Object[] args = {};
+ String msg = formatter.format(args);
+ throw new IllegalStateException(msg);
+ }
+
+ List<DeploymentTarget> targets = getDeploymentTargets();
+ SerializableDeploymentID deployment = new SerializableDeploymentID(name, getTargetProfile(), contentURL.toString());
+ deployment.setContentURL(contentURL);
+ for(DeploymentOption option : options)
+ deployment.addDeploymentOption(option);
+ return new DeploymentProgressImpl(targets, deployment, CommandType.DISTRIBUTE);
+ }
+
public String[] getRepositoryNames(String[] names) throws Exception
{
List<DeploymentTarget> targets = getDeploymentTargets();
Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/SerializableDeploymentID.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/SerializableDeploymentID.java 2009-05-19 12:28:25 UTC (rev 89041)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/SerializableDeploymentID.java 2009-05-19 12:37:16 UTC (rev 89042)
@@ -25,8 +25,11 @@
import java.io.Serializable;
import java.net.URL;
import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
import org.jboss.deployers.spi.management.deploy.DeploymentID;
+import org.jboss.profileservice.spi.DeploymentOption;
import org.jboss.profileservice.spi.ProfileKey;
/**
@@ -39,6 +42,7 @@
/** An InputStream to use to copy the contents */
private transient InputStream contentIS;
+ private Set<DeploymentOption> options;
private String[] deploymentNames;
private String[] repositoryNames;
private ProfileKey profileKey;
@@ -62,6 +66,7 @@
this.profileKey = profileKey;
this.description = description;
this.copyContent = true; // by default we copy content
+ this.options = new HashSet<DeploymentOption>();
}
public String[] getNames()
@@ -131,6 +136,30 @@
this.contentIS = contentIS;
}
+ public void addDeploymentOption(DeploymentOption option)
+ {
+ if(option == null)
+ throw new IllegalArgumentException("null option");
+ this.options.add(option);
+ }
+
+ public DeploymentOption[] getDeploymentOptions()
+ {
+ return this.options.toArray(new DeploymentOption[this.options.size()]);
+ }
+
+ public boolean hasDeploymentOption(DeploymentOption option)
+ {
+ if(option == null)
+ throw new IllegalArgumentException("null option");
+ return this.options.contains(option);
+ }
+
+ public boolean removeDeploymentOption(DeploymentOption option)
+ {
+ return this.options.remove(option);
+ }
+
public String toString()
{
StringBuffer buffer = new StringBuffer();
Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java 2009-05-19 12:28:25 UTC (rev 89041)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java 2009-05-19 12:37:16 UTC (rev 89042)
@@ -224,7 +224,8 @@
String[] names = deploymentTarget.getNames();
// Add deployment content to the repository
- String repositoryName = deploymentRepository.addDeploymentContent(names[0], contentIS);
+ String repositoryName = deploymentRepository.addDeploymentContent(names[0], contentIS,
+ deploymentTarget.getDeploymentOptions());
// FIXME make deployment visible to management view
VirtualFile vf = deploymentRepository.getDeploymentContent(repositoryName);
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/xml/PersistedGenericValue.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/xml/PersistedGenericValue.java 2009-05-19 12:28:25 UTC (rev 89041)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/xml/PersistedGenericValue.java 2009-05-19 12:37:16 UTC (rev 89042)
@@ -23,8 +23,11 @@
import static org.jboss.system.server.profileservice.persistence.PersistenceConstants.MANAGED_OBJECT_ELEMENT_NAME;
+import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlElement;
+import org.w3c.dom.Element;
+
/**
* The persisted generic value.
*
@@ -37,6 +40,9 @@
/** A managed-object. */
private PersistedManagedObject managedObject;
+ /** A generic element. */
+ private Element generic;
+
@XmlElement(name = MANAGED_OBJECT_ELEMENT_NAME, type = PersistedManagedObject.class)
public PersistedManagedObject getManagedObject()
{
@@ -48,9 +54,23 @@
this.managedObject = managedObject;
}
+ @XmlAnyElement
+ public Element getGeneric()
+ {
+ return generic;
+ }
+
+ public void setGeneric(Element generic)
+ {
+ this.generic = generic;
+ }
+
protected void toString(StringBuilder builder)
{
- builder.append(", managed-object = ").append(getManagedObject());
+ if(getManagedObject() != null)
+ builder.append(", managed-object = ").append(getManagedObject());
+ if(getGeneric() != null)
+ builder.append(", generic-value = ").append(getGeneric());
}
@Override
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java 2009-05-19 12:28:25 UTC (rev 89041)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java 2009-05-19 12:37:16 UTC (rev 89042)
@@ -36,6 +36,7 @@
import java.util.zip.ZipInputStream;
import org.jboss.profileservice.spi.DeploymentContentFlags;
+import org.jboss.profileservice.spi.DeploymentOption;
import org.jboss.profileservice.spi.ModificationInfo;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.ProfileKey;
@@ -142,6 +143,12 @@
public String addDeploymentContent(String vfsPath, InputStream contentIS) throws IOException
{
+ return addDeploymentContent(vfsPath, contentIS, new DeploymentOption[0]);
+ }
+
+ public String addDeploymentContent(String vfsPath, InputStream contentIS, DeploymentOption... options)
+ throws IOException
+ {
boolean trace = log.isTraceEnabled();
// Suspend hot deployment checking
if( trace )
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java 2009-05-19 12:28:25 UTC (rev 89041)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java 2009-05-19 12:37:16 UTC (rev 89042)
@@ -36,6 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.profileservice.spi.DeploymentContentFlags;
+import org.jboss.profileservice.spi.DeploymentOption;
import org.jboss.profileservice.spi.ModificationInfo;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.ProfileKey;
@@ -296,7 +297,7 @@
}
}
- public String addDeploymentContent(String vfsPath, InputStream contentIS) throws IOException
+ public String addDeploymentContent(String vfsPath, InputStream contentIS, DeploymentOption... options) throws IOException
{
if (this.clusteringHandler == null)
{
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ImmutableClusteredDeploymentRepository.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ImmutableClusteredDeploymentRepository.java 2009-05-19 12:28:25 UTC (rev 89041)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ImmutableClusteredDeploymentRepository.java 2009-05-19 12:37:16 UTC (rev 89042)
@@ -30,6 +30,7 @@
import java.util.Map;
import java.util.Set;
+import org.jboss.profileservice.spi.DeploymentOption;
import org.jboss.profileservice.spi.DeploymentRepository;
import org.jboss.profileservice.spi.ModificationInfo;
import org.jboss.profileservice.spi.ProfileKey;
@@ -66,7 +67,7 @@
return Collections.emptySet();
}
- public String addDeploymentContent(String vfsPath, InputStream contentIS) throws IOException
+ public String addDeploymentContent(String vfsPath, InputStream contentIS, DeploymentOption... options) throws IOException
{
throw new IllegalStateException("Cannot add content to an immutable repository.");
}
More information about the jboss-cvs-commits
mailing list