Removed more modules as in Oscar's TUSCANY-2440 reduced-set patch. Also removed newer modules added since r643746 and are not required to run the minimum set that we are porting to android. Set svn ignore properties to ignore Manifest files produced by the build.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695356 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 0 insertions, 428 deletions

diff --git a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/CacheContext.java b/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/CacheContext.java
deleted file mode 100644
index aa80b7a40b..0000000000
--- a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/CacheContext.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.binding.http;

-

-import java.text.SimpleDateFormat;

-import java.util.Date;

-

-import javax.servlet.http.HttpServletRequest;

-

-/**

- * A class to store cache settings for Atom and HTTP requests and responses.

- * 

- * Predicates are statements that work in conjunction with

- * ETags and LastModified dates to determine if a precondition

- * or postcondition is satisfied.

- * See HTTP specification for how predicates wrk:

- * http://tools.ietf.org/html/rfc2616

- * Example predicates in HTTP include If-Match, If-None-Match,

- * If-Modified-Since, If-Unmodified-Since, If-Range.

-

- */

-public class CacheContext {

-    public static final SimpleDateFormat RFC822DateFormat = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss Z" ); // RFC 822 date time

-    

-    public boolean enabled;

-	public String eTag;

-	public String lastModified;

-	public Date lastModifiedDate;

-	public boolean ifModifiedSince;

-	public boolean ifUnmodifiedSince;

-	public boolean ifMatch;

-	public boolean ifNoneMatch;

-	public boolean ifRange;

-

-	/**

-	 * An ETag is a unique ID for an item. It changes when

-	 * a field in the item or the update date changes.

-	 * See HTTP specification for how ETags work:

-	 * http://tools.ietf.org/html/rfc2616

-	 * @return the eTag

-	 */

-	public String getETag() {

-		return eTag;

-	}

-	/**

-	 * @param tag the eTag to set

-	 */

-	public void setETag(String tag) {

-		eTag = tag;

-		enabled = true;

-	}

-	/**

-	 * The LastModified date is the time the item was last 

-	 * changed. See HTTP specification for how ETags work:

-	 * http://tools.ietf.org/html/rfc2616

-	 * @return the lastModified

-	 */

-	public String getLastModified() {

-		return lastModified;

-	}

-	/**

-	 * The LastModified date is the time the item was last 

-	 * changed. See HTTP specification for how ETags work:

-	 * http://tools.ietf.org/html/rfc2616

-	 * @return the lastModified

-	 */

-	public Date getLastModifiedAsDate() {

-		return lastModifiedDate;

-	}

-	/**

-	 * @param lastModified the lastModified to set

-	 */

-	public void setLastModified(String lastModified) throws java.text.ParseException {

-		this.lastModified = lastModified;

-		// Catch date formatting on input to help debugging.

-  		lastModifiedDate = RFC822DateFormat.parse( lastModified );

-		enabled = true;

-	}

-	

-	/**

-	 * @param lastModified the lastModified to set

-	 */

-	public void setLastModified(Date updated) {

-		this.lastModified = RFC822DateFormat.format( updated );

-  		lastModifiedDate = updated;

-		enabled = true;

-	}

-	

-	/**

-	 * @return the ifModifedSince

-	 */

-	public boolean isIfModifiedSince() {

-		return ifModifiedSince;

-	}

-	/**

-	 * @param ifModifedSince the ifModifedSince to set

-	 */

-	public void setIfModifiedSince(boolean ifModifiedSince) {

-		this.ifModifiedSince = ifModifiedSince;

-		if ( ifModifiedSince )

-			enabled = true;

-	}

-	/**

-	 * @return the ifUnModifiedSince

-	 */

-	public boolean isIfUnmodifiedSince() {

-		return ifUnmodifiedSince;

-	}

-	/**

-	 * @param ifUnModifiedSince the ifUnModifiedSince to set

-	 */

-	public void setIfUnmodifiedSince(boolean ifUnmodifiedSince) {

-		this.ifUnmodifiedSince = ifUnmodifiedSince;

-		if ( ifUnmodifiedSince )

-			enabled = true;

-	}

-	/**

-	 * @return the ifMatch

-	 */

-	public boolean isIfMatch() {

-		return ifMatch;

-	}

-	/**

-	 * @param ifMatch the ifMatch to set

-	 */

-	public void setIfMatch(boolean ifMatch) {

-		this.ifMatch = ifMatch;

-		if ( ifMatch )

-			enabled = true;

-	}

-	/**

-	 * @return the ifNoneMatch

-	 */

-	public boolean isIfNoneMatch() {

-		return ifNoneMatch;

-	}

-	/**

-	 * @param ifNoneMatch the ifNoneMatch to set

-	 */

-	public void setIfNoneMatch(boolean ifNoneMatch) {

-		this.ifNoneMatch = ifNoneMatch;

-		if ( ifNoneMatch )

-			enabled = true;

-	}

-	/**

-	 * @return the ifRange

-	 */

-	public boolean isIfRange() {

-		return ifRange;

-	}

-	/**

-	 * @param ifRange the ifRange to set

-	 */

-	public void setIfRange(boolean ifRange) {

-		this.ifRange = ifRange;

-		if ( ifRange )

-			enabled = true;

-	}

-

-    public String toString() {

-    	final String PREDPREFIX = ", predicates=";

-		StringBuffer sb = new StringBuffer(PREDPREFIX);

-		if ( ifMatch || ifNoneMatch || ifModifiedSince || ifUnmodifiedSince || ifRange ) {

-			if ( ifMatch ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-Match");

-			}

-			if ( ifNoneMatch ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-None-Match");

-			}

-			if ( ifModifiedSince ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-Modified-Since");

-			}

-			if ( ifUnmodifiedSince ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-UnModified-Since");

-			}

-			if ( ifRange ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-Range");

-			}

-		} else {

-			sb.append("null");

-		}

-

-		return "eTag=" + eTag + ", lastModified=" + lastModified

-				+ sb.toString();

-	}

-

-    /**

-     * Gets the cache context information (ETag, LastModified, predicates) from the Http request.

-     * @param request

-     * @return

-     */

-    public static CacheContext getCacheContextFromRequest( HttpServletRequest request ) throws java.text.ParseException {

-    	CacheContext context = new CacheContext();

-    	

-    	String eTag = request.getHeader( "If-Match" );    	

-    	if ( eTag != null ) {

-    	   context.setETag( eTag );

-    	   context.setIfMatch( true );

-    	}

-    	eTag = request.getHeader( "If-None-Match" );    	

-    	if ( eTag != null ) {

-    	   context.setETag( eTag );

-    	   context.setIfNoneMatch( true );

-    	}

-        String lastModifiedString = request.getHeader( "If-Modified-Since" );        

-    	if ( lastModifiedString != null ) {

-     	   context.setLastModified( lastModifiedString );

-    	   context.setIfModifiedSince( true );

-     	}

-        lastModifiedString = request.getHeader( "If-Unmodified-Since" );        

-    	if ( lastModifiedString != null ) {

-     	   context.setLastModified( lastModifiedString );

-    	   context.setIfUnmodifiedSince( true );

-     	}

-        lastModifiedString = request.getHeader( "If-Range" );        

-    	if ( lastModifiedString != null ) {

-     	   context.setLastModified( lastModifiedString );

-    	   context.setIfRange( true );

-     	}

-    	return context;

-    }

-	/**

-	 * Enabled is true whenever ETag, LastModified, or predicate is set.

-	 * @return the enabled

-	 */

-	public boolean isEnabled() {

-		return enabled;

-	}

-	/**

-	 * @param enabled the enabled to set

-	 */

-	public void setEnabled(boolean enabled) {

-		this.enabled = enabled;

-	}

-}

diff --git a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
deleted file mode 100644
index 6192b92dfe..0000000000
--- a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.http;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-
-/**
- * HTTP binding model.
- * 
- * @version $Rev$ $Date$
-*/
-public interface HTTPBinding extends Binding {
-}
diff --git a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
deleted file mode 100644
index 370e4cdb67..0000000000
--- a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.http;
-
-/**
- * Factory for the HTTP binding model.
- *
- * @version $Rev$ $Date$
- */
-public interface HTTPBindingFactory {
-    
-    /**
-     * Creates a new HTTP binding.
-     * @return a new HTTP binding
-     */
-    HTTPBinding createHTTPResourceBinding();
-
-}
diff --git a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
deleted file mode 100644
index 7e72b7dd85..0000000000
--- a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.http.impl;
-
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.binding.http.HTTPBindingFactory;
-
-/**
- * Factory for the HTTP binding model.
- *
- * @version $Rev$ $Date$
- */
-public class HTTPBindingFactoryImpl implements HTTPBindingFactory {
-
-    public HTTPBinding createHTTPResourceBinding() {
-        return new HTTPBindingImpl();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
deleted file mode 100644
index 69d2bd7d25..0000000000
--- a/branches/sca-android/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.http.impl;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-
-
-/**
- * Implementation of the HTTP binding model.
- * 
- * @version $Rev$ $Date$
- */
-class HTTPBindingImpl implements HTTPBinding {
-    
-    private String name;
-    private String uri;
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The sample binding is always resolved
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }     
-
-}