Author: kstam
Date: Tue Jun 26 08:00:43 2007
New Revision: 550821
URL: http://svn.apache.org/viewvc?view=rev&rev=550821
Log:
SCOUT-16, SCOUT-35. Moving to prefered maven structure in SVN, and changing
collection to HashSet.
Added:
webservices/scout/trunk/modules/jaxr-api/src/main/
webservices/scout/trunk/modules/jaxr-api/src/main/java/
- copied from r547768, webservices/scout/trunk/modules/jaxr-api/src/java/
webservices/scout/trunk/modules/scout/src/main/
webservices/scout/trunk/modules/scout/src/main/java/
- copied from r547768, webservices/scout/trunk/modules/scout/src/java/
webservices/scout/trunk/modules/scout/src/test/java/
webservices/scout/trunk/modules/scout/src/test/java/org/
- copied from r547768, webservices/scout/trunk/modules/scout/src/test/org/
Removed:
webservices/scout/trunk/modules/jaxr-api/src/java/
webservices/scout/trunk/modules/scout/src/java/
webservices/scout/trunk/modules/scout/src/test/org/
Modified:
webservices/scout/trunk/etc/project.xml
webservices/scout/trunk/modules/jaxr-api/pom.xml
webservices/scout/trunk/modules/scout/pom.xml
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
webservices/scout/trunk/modules/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java
Modified: webservices/scout/trunk/etc/project.xml
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/etc/project.xml?view=diff&rev=550821&r1=550820&r2=550821
==============================================================================
--- webservices/scout/trunk/etc/project.xml (original)
+++ webservices/scout/trunk/etc/project.xml Tue Jun 26 08:00:43 2007
@@ -107,8 +107,8 @@
<build>
<nagEmailAddress>[email protected]</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
Modified: webservices/scout/trunk/modules/jaxr-api/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/modules/jaxr-api/pom.xml?view=diff&rev=550821&r1=550820&r2=550821
==============================================================================
--- webservices/scout/trunk/modules/jaxr-api/pom.xml (original)
+++ webservices/scout/trunk/modules/jaxr-api/pom.xml Tue Jun 26 08:00:43 2007
@@ -21,26 +21,10 @@
</dependency>
</dependencies>
<build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <resources>
- <resource>
- <directory>conf</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- </excludes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
<inherited>true</inherited>
<configuration>
<skip>false</skip>
Modified: webservices/scout/trunk/modules/scout/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/modules/scout/pom.xml?view=diff&rev=550821&r1=550820&r2=550821
==============================================================================
--- webservices/scout/trunk/modules/scout/pom.xml (original)
+++ webservices/scout/trunk/modules/scout/pom.xml Tue Jun 26 08:00:43 2007
@@ -78,25 +78,13 @@
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <resources>
- <resource>
- <directory>conf</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- </excludes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -108,7 +96,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
+ <version>2.3</version>
<configuration>
<skip>false</skip>
<excludes>
Modified:
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java?view=diff&rev=550821&r1=547768&r2=550821
==============================================================================
---
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java
(original)
+++
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BulkResponseImpl.java
Tue Jun 26 08:00:43 2007
@@ -18,8 +18,11 @@
import javax.xml.registry.BulkResponse;
import javax.xml.registry.JAXRException;
+import javax.xml.registry.infomodel.RegistryObject;
+
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
/**
* Implements JAXR BulkResponse Interface.
@@ -33,8 +36,7 @@
private boolean partialResponse = false;
private Collection exceptions = new ArrayList();
- private Collection collection = new ArrayList();
-
+ private HashSet collection = new HashSet();
/**
* Creates a new instance of BulkResponseImpl
*/
@@ -42,7 +44,7 @@
{
}
- BulkResponseImpl(Collection collection)
+ BulkResponseImpl(HashSet collection)
{
this.collection = collection;
}
@@ -86,7 +88,7 @@
this.partialResponse = b;
}
- public void setCollection(Collection coll) throws JAXRException
+ public void setCollection(HashSet coll) throws JAXRException
{
this.collection = coll;
}
Modified:
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java?view=diff&rev=550821&r1=547768&r2=550821
==============================================================================
---
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
(original)
+++
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
Tue Jun 26 08:00:43 2007
@@ -56,6 +56,7 @@
import java.net.PasswordAuthentication;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.Vector;
@@ -161,7 +162,7 @@
Iterator iter = col.iterator();
- Collection suc = new ArrayList();
+ HashSet suc = new HashSet();
Collection exc = new ArrayList();
while (iter.hasNext()) {
@@ -222,7 +223,7 @@
BulkResponseImpl bulk = new BulkResponseImpl();
PublisherAssertion[] sarr = new PublisherAssertion[asso.size()];
- Collection coll = new ArrayList();
+ HashSet coll = new HashSet();
Collection exceptions = new ArrayList();
Iterator iter = asso.iterator();
@@ -269,7 +270,7 @@
BulkResponseImpl bulk = new BulkResponseImpl();
TModel[] entityarr = new TModel[schemes.size()];
- Collection coll = new ArrayList();
+ HashSet coll = new HashSet();
Collection exceptions = new ArrayList();
Iterator iter = schemes.iterator();
@@ -315,7 +316,7 @@
BulkResponseImpl bulk = new BulkResponseImpl();
TModel[] entityarr = new TModel[concepts.size()];
- Collection coll = new ArrayList();
+ HashSet coll = new HashSet();
Collection exceptions = new ArrayList();
Iterator iter = concepts.iterator();
@@ -361,7 +362,7 @@
BulkResponseImpl bulk = new BulkResponseImpl();
BusinessEntity[] entityarr = new BusinessEntity[organizations.size()];
- Collection coll = new ArrayList();
+ HashSet coll = new HashSet();
Collection exceptions = new ArrayList();
Iterator iter = organizations.iterator();
@@ -406,7 +407,7 @@
BulkResponseImpl bulk = new BulkResponseImpl();
BindingTemplate[] sbarr = new BindingTemplate[bindings.size()];
- Collection coll = new ArrayList();
+ HashSet coll = new HashSet();
Collection exceptions = new ArrayList();
Iterator iter = bindings.iterator();
@@ -447,7 +448,7 @@
BulkResponseImpl bulk = new BulkResponseImpl();
BusinessService[] sarr = new BusinessService[services.size()];
- Collection coll = new ArrayList();
+ HashSet coll = new HashSet();
Collection exceptions = new ArrayList();
@@ -487,7 +488,7 @@
public void confirmAssociation(Association assoc) throws JAXRException,
InvalidRequestException {
//Store it in the UDDI registry
- Collection col = new ArrayList();
+ HashSet col = new HashSet();
col.add(assoc);
BulkResponse br = this.saveAssociations(col, true);
if(br.getExceptions()!= null)
@@ -658,7 +659,7 @@
String[] keyarr = new String[keys.size()];
Result[] keyResultArr;
- Collection coll = new ArrayList();
+ HashSet coll = new HashSet();
Collection exceptions = new ArrayList();
try {
Modified:
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java?view=diff&rev=550821&r1=547768&r2=550821
==============================================================================
---
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
(original)
+++
webservices/scout/trunk/modules/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
Tue Jun 26 08:00:43 2007
@@ -70,6 +70,7 @@
import java.net.PasswordAuthentication;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -130,12 +131,12 @@
registryService.getMaxRows());
BusinessInfo[] a = result.getBusinessInfos() != null ?
result.getBusinessInfos().getBusinessInfoArray() : null;
- Collection orgs = new ArrayList();
+ HashSet orgs = null;
int len = 0;
if (a != null)
{
len = a.length;
- orgs = new ArrayList(len);
+ orgs = new HashSet();
}
for (int i = 0; i < len; i++)
{
@@ -167,12 +168,12 @@
registry.getPublisherAssertions(auth.getAuthInfo());
PublisherAssertion[] a = result.getPublisherAssertionArray();
- Collection col = null;
+ HashSet col = null;
int len = 0;
if (a != null)
{
len = a.length;
- col = new ArrayList(len);
+ col = new HashSet();
}
for (int i = 0; i < len; i++)
{
@@ -228,12 +229,12 @@
report =
registry.getAssertionStatusReport(auth.getAuthInfo(),confirm);
AssertionStatusItem[] a = report.getAssertionStatusItemArray();
- Collection col = new ArrayList();
+ HashSet col = null;
int len = 0;
if (a != null)
{
len = a.length;
- col = new ArrayList(len);
+ col = new HashSet();
}
for (int i = 0; i < len; i++)
{
@@ -485,7 +486,7 @@
Collection externalLinks) throws JAXRException
{
//TODO: Handle this better
- Collection col = new ArrayList();
+ HashSet col = new HashSet();
Iterator iter = namePatterns.iterator();
String name = "";
while(iter.hasNext())
@@ -514,7 +515,7 @@
Collection externalIdentifiers,
Collection externalLinks) throws
JAXRException
{
- Collection col = new ArrayList();
+ HashSet col = new HashSet();
//Lets ask the uddi registry if it has the TModels
IRegistry registry = registryService.getRegistry();
@@ -582,7 +583,7 @@
if (l != null) {
BindingTemplate[] bindarr= l.getBindingTemplateArray();
- Collection col = new ArrayList();
+ HashSet col = new HashSet();
for (int i=0; bindarr != null && i < bindarr.length; i++) {
BindingTemplate si = bindarr[i];
@@ -659,7 +660,7 @@
ServiceInfo[] a = (serviceInfos != null ?
serviceInfos.getServiceInfoArray() : null);
- Collection col = new ArrayList();
+ HashSet col = new HashSet();
for (int i=0; a != null && i < a.length; i++) {
ServiceInfo si = (ServiceInfo) a[i];
@@ -808,7 +809,7 @@
LifeCycleManager.ORGANIZATION,
LifeCycleManager.SERVICE};
- Collection c = new ArrayList();
+ HashSet c = new HashSet();
for (int i = 0; i < types.length; i++) {
try {
@@ -844,7 +845,7 @@
keys[currLoc] = key.getId();
currLoc++;
}
- Collection col = new ArrayList();
+ HashSet col = new HashSet();
LifeCycleManager lcm = registryService.getLifeCycleManagerImpl();
if
(LifeCycleManager.CLASSIFICATION_SCHEME.equalsIgnoreCase(objectType))
Modified:
webservices/scout/trunk/modules/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/modules/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java?view=diff&rev=550821&r1=547768&r2=550821
==============================================================================
---
webservices/scout/trunk/modules/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java
(original)
+++
webservices/scout/trunk/modules/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java
Tue Jun 26 08:00:43 2007
@@ -267,6 +267,8 @@
private ArrayList findTempOrgs() throws JAXRException {
ArrayList toReturn = new ArrayList(2);
+ toReturn.add(null);
+ toReturn.add(null);
// Define find qualifiers and name patterns
Collection findQualifiers = new ArrayList();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
