abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r567853 - in /incubator/abdera/java/trunk/spring: ./ src/main/resources/META-INF/ src/main/resources/META-INF/schemas/ src/test/java/org/apache/abdera/spring/
Date Mon, 20 Aug 2007 22:11:51 GMT
Author: jmsnell
Date: Mon Aug 20 15:11:50 2007
New Revision: 567853

URL: http://svn.apache.org/viewvc?rev=567853&view=rev
Log:
Just noticed that some wierd patch bug caused content in the resources files to be duplicated.
Fixed

Modified:
    incubator/abdera/java/trunk/spring/pom.xml
    incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd
    incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.handlers
    incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.schemas
    incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/beans.xml

Modified: incubator/abdera/java/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/pom.xml?rev=567853&r1=567852&r2=567853&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/pom.xml (original)
+++ incubator/abdera/java/trunk/spring/pom.xml Mon Aug 20 15:11:50 2007
@@ -67,70 +67,3 @@
     </dependency>
   </dependencies>
 </project>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  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.  For additional information regarding
-  copyright in this work, please see the NOTICE file in the top level
-  directory of this distribution. -->
-<project 
-  xmlns="http://maven.apache.org/POM/4.0.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.abdera</groupId>
-    <artifactId>abdera</artifactId>
-    <version>0.3.0-incubating-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>abdera-spring</artifactId>
-  <packaging>jar</packaging>  
-  <name>Abdera Spring Integration</name>  
-  <version>0.3.0-incubating-SNAPSHOT</version>
-  <description>Spring Integration Code for Abdera</description>  
-  <inceptionYear>2006</inceptionYear>
-  <url>http://incubator.apache.org/abdera</url>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</developerConnection>
-    <url>http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</url>
-  </scm>
-  <dependencies>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-      </dependency>
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-server</artifactId>
-      <version>0.3.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>2.0.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-mock</artifactId>
-      <version>2.0.6</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

Modified: incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd?rev=567853&r1=567852&r2=567853&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd
(original)
+++ incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd
Mon Aug 20 15:11:50 2007
@@ -60,65 +60,4 @@
       </xsd:complexContent>
     </xsd:complexType>
   </xsd:element>
-</xsd:schema>
-<!--
-  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.
--->
-<xsd:schema
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:beans="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
-  targetNamespace="http://abdera.apache.org" 
-  elementFormDefault="qualified"
-  attributeFormDefault="unqualified"  >
-
-  <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
-
-  <xsd:element name="serviceContext">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="beans:identifiedType">
-          <xsd:sequence>
-            <xsd:element name="provider" type="xsd:anyType" minOccurs="0"/>
-            <xsd:element name="providerManager" type="xsd:anyType" minOccurs="0"/>
-            <xsd:element name="targetResolver" type="xsd:anyType" minOccurs="0"/>
-            <xsd:element name="subjectResolver" type="xsd:anyType" minOccurs="0"/>
-          </xsd:sequence>
-          <xsd:attribute name="class" type="xsd:string" />
-        </xsd:extension>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="regexTargetResolver">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="beans:identifiedType">
-          <xsd:sequence>
-            <xsd:element name="category" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="collection" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="entry" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="media" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="service" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:extension>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
+</xsd:schema>
\ No newline at end of file

Modified: incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.handlers?rev=567853&r1=567852&r2=567853&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.handlers (original)
+++ incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.handlers Mon Aug
20 15:11:50 2007
@@ -19,23 +19,4 @@
 #    under the License.
 #
 #
-http\://abdera.apache.org=org.apache.abdera.spring.NamespaceHandler#
-#    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.
-#
-#
 http\://abdera.apache.org=org.apache.abdera.spring.NamespaceHandler

Modified: incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.schemas?rev=567853&r1=567852&r2=567853&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/abdera/java/trunk/spring/src/main/resources/META-INF/spring.schemas Mon Aug
20 15:11:50 2007
@@ -19,23 +19,4 @@
 #    under the License.
 #
 #
-http\://abdera.apache.org/schemas/abdera-spring.xsd=META-INF/schemas/abdera-spring.xsd#
-#    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.
-#
-#
 http\://abdera.apache.org/schemas/abdera-spring.xsd=META-INF/schemas/abdera-spring.xsd

Modified: incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/beans.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/beans.xml?rev=567853&r1=567852&r2=567853&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/beans.xml (original)
+++ incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/beans.xml Mon
Aug 20 15:11:50 2007
@@ -28,32 +28,4 @@
   <bean id="provider" class="org.apache.abdera.spring.TestProvider">
   </bean>
 
-</beans><beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:a="http://abdera.apache.org"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-    http://abdera.apache.org http://abdera.apache.org/schemas/abdera-spring.xsd">
-
-  <!-- Abdera -->
-  <a:serviceContext>
-  
-    <a:provider>
-      <ref bean="provider"/>
-    </a:provider>
-    
-    <a:targetResolver>
-      <a:regexTargetResolver>
-        <a:collection>/atom/feed(\\?[^#]*)?</a:collection>
-        <a:entry>/atom/feed/([^/#?]+)(\\?[^#]*)?</a:entry>
-        <a:service>/atom(\\?[^#]*)?</a:service>
-      </a:regexTargetResolver>
-    </a:targetResolver>
-    
-  </a:serviceContext>
-
-  
-  <bean id="provider" class="org.apache.abdera.spring.TestProvider">
-  </bean>
-
 </beans>



Mime
View raw message