1.1 --- a/spring.lookup/manifest.mf Thu Jun 07 20:34:55 2012 +0200
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,5 +0,0 @@
1.4 -Manifest-Version: 1.0
1.5 -OpenIDE-Module: org.netbeans.modules.spring.lookup
1.6 -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spring/lookup/resources/Bundle.properties
1.7 -OpenIDE-Module-Specification-Version: 1.1
1.8 -
2.1 --- a/spring.lookup/pom.xml Thu Jun 07 20:34:55 2012 +0200
2.2 +++ b/spring.lookup/pom.xml Sun Mar 22 09:34:51 2015 +0100
2.3 @@ -1,54 +1,33 @@
2.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2.5 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2.6 - <modelVersion>4.0.0</modelVersion>
2.7 - <groupId>org.apidesign</groupId>
2.8 - <artifactId>spring-lookup</artifactId>
2.9 - <packaging>jar</packaging>
2.10 - <version>1.2</version>
2.11 - <parent>
2.12 - <groupId>org.apidesign</groupId>
2.13 - <artifactId>all-lookup</artifactId>
2.14 - <relativePath>..</relativePath>
2.15 - <version>2.0</version>
2.16 - </parent>
2.17 - <name>Bridge between Spring and Lookup</name>
2.18 - <url>http://wiki.apidesign.org/wiki/LookupAndSpring</url>
2.19 - <ciManagement>
2.20 - <system>hudson</system>
2.21 - <url>http://hudson.apidesign.org/hudson/job/lookup</url>
2.22 - </ciManagement>
2.23 +<?xml version="1.0" encoding="UTF-8"?>
2.24 +<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/xsd/maven-4.0.0.xsd">
2.25 + <modelVersion>4.0.0</modelVersion>
2.26 + <groupId>org.apidesign</groupId>
2.27 + <artifactId>spring-lookup</artifactId>
2.28 + <packaging>jar</packaging>
2.29 + <version>1.2</version>
2.30 + <parent>
2.31 + <groupId>org.apidesign</groupId>
2.32 + <artifactId>all-lookup</artifactId>
2.33 + <version>2.0</version>
2.34 + </parent>
2.35 + <name>Bridge between Spring and Lookup</name>
2.36 + <url>http://wiki.apidesign.org/wiki/LookupAndSpring</url>
2.37 + <ciManagement>
2.38 + <system>hudson</system>
2.39 + <url>http://hudson.apidesign.org/hudson/job/lookup</url>
2.40 + </ciManagement>
2.41 <build>
2.42 <plugins>
2.43 <plugin>
2.44 <groupId>org.apache.maven.plugins</groupId>
2.45 - <artifactId>maven-compiler-plugin</artifactId>
2.46 - <version>2.0.2</version>
2.47 - <configuration>
2.48 - <source>1.5</source>
2.49 - <target>1.5</target>
2.50 - </configuration>
2.51 - </plugin>
2.52 - <plugin>
2.53 - <groupId>org.apache.maven.plugins</groupId>
2.54 - <artifactId>maven-surefire-plugin</artifactId>
2.55 - <version>2.4.2</version>
2.56 - <configuration>
2.57 - <includes>
2.58 - <include>**/*Test.java</include>
2.59 - </includes>
2.60 - </configuration>
2.61 - </plugin>
2.62 - <plugin>
2.63 - <groupId>org.apache.maven.plugins</groupId>
2.64 <artifactId>maven-javadoc-plugin</artifactId>
2.65 - <version>2.5</version>
2.66 + <version>2.10.1</version>
2.67 <configuration>
2.68 <detectLinks>true</detectLinks>
2.69 <links>
2.70 - <link>http://bits.netbeans.org/6.8/javadoc/org-openide-util/</link>
2.71 + <link>http://bits.netbeans.org/8.0/javadoc/org-openide-util-lookup/</link>
2.72 <link>http://static.springsource.org/spring/docs/2.5.6/api/</link>
2.73 </links>
2.74 - <excludePackageNames>org.netbeans.modules.spring.lookup</excludePackageNames>
2.75 </configuration>
2.76 </plugin>
2.77 </plugins>
2.78 @@ -56,9 +35,8 @@
2.79 <dependencies>
2.80 <dependency>
2.81 <groupId>org.netbeans.api</groupId>
2.82 - <artifactId>org-netbeans-modules-nbjunit</artifactId>
2.83 - <version>RELEASE68</version>
2.84 - <scope>test</scope>
2.85 + <artifactId>org-openide-util-lookup</artifactId>
2.86 + <version>RELEASE80</version>
2.87 </dependency>
2.88 <dependency>
2.89 <groupId>org.netbeans.modules</groupId>
2.90 @@ -68,26 +46,26 @@
2.91 </dependency>
2.92 <dependency>
2.93 <groupId>org.springframework</groupId>
2.94 - <artifactId>spring-core</artifactId>
2.95 + <artifactId>spring-context</artifactId>
2.96 <version>2.5.6</version>
2.97 + <type>jar</type>
2.98 </dependency>
2.99 <dependency>
2.100 - <groupId>org.springframework</groupId>
2.101 - <artifactId>spring-beans</artifactId>
2.102 - <version>2.5.6</version>
2.103 - </dependency>
2.104 - <dependency>
2.105 - <groupId>org.springframework</groupId>
2.106 - <artifactId>spring-context</artifactId>
2.107 - <version>2.5.6</version>
2.108 - </dependency>
2.109 - <dependency>
2.110 - <groupId>org.netbeans.api</groupId>
2.111 - <artifactId>org-openide-util</artifactId>
2.112 - <version>RELEASE68</version>
2.113 + <groupId>junit</groupId>
2.114 + <artifactId>junit</artifactId>
2.115 + <version>4.10</version>
2.116 + <scope>test</scope>
2.117 + <type>jar</type>
2.118 </dependency>
2.119 </dependencies>
2.120 - <description>Provides mapping between Lookup library,
2.121 -so it is directly usable with Spring Framework's
2.122 -dependency injection.</description>
2.123 + <properties>
2.124 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2.125 + <maven.compiler.source>1.7</maven.compiler.source>
2.126 + <maven.compiler.target>1.7</maven.compiler.target>
2.127 + </properties>
2.128 + <description>
2.129 + Provides mapping between Lookup library,
2.130 + so it is directly usable with Spring Framework's
2.131 + dependency injection.
2.132 + </description>
2.133 </project>
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/spring.lookup/src/main/java/org/apidesign/spring/package.html Sun Mar 22 09:34:51 2015 +0100
3.3 @@ -0,0 +1,50 @@
3.4 +<!--
3.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3.6 + *
3.7 + * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
3.8 + *
3.9 + * The contents of this file are subject to the terms of either the GNU
3.10 + * General Public License Version 2 only ("GPL") or the Common
3.11 + * Development and Distribution License("CDDL") (collectively, the
3.12 + * "License"). You may not use this file except in compliance with the
3.13 + * License. You can obtain a copy of the License at
3.14 + * http://www.netbeans.org/cddl-gplv2.html
3.15 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
3.16 + * specific language governing permissions and limitations under the
3.17 + * License. When distributing the software, include this License Header
3.18 + * Notice in each file and include the License file at
3.19 + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3.20 + * particular file as subject to the "Classpath" exception as provided
3.21 + * by Sun in the GPL Version 2 section of the License file that
3.22 + * accompanied this code. If applicable, add the following below the
3.23 + * License Header, with the fields enclosed by brackets [] replaced by
3.24 + * your own identifying information:
3.25 + * "Portions Copyrighted [year] [name of copyright owner]"
3.26 + *
3.27 + * Contributor(s):
3.28 + *
3.29 + * The Original Software is NetBeans. The Initial Developer of the Original
3.30 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
3.31 + * Microsystems, Inc. All Rights Reserved.
3.32 + *
3.33 + * If you wish your version of this file to be governed by only the CDDL
3.34 + * or only the GPL Version 2, indicate your decision by adding
3.35 + * "[Contributor] elects to include this software in this distribution
3.36 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
3.37 + * single choice of license, a recipient has the option to distribute
3.38 + * your version of this file under either the CDDL, the GPL Version 2 or
3.39 + * to extend the choice of license to its licensees as provided above.
3.40 + * However, if you add GPL Version 2 code and therefore, elected the GPL
3.41 + * Version 2 license, then the option applies only if the new code is
3.42 + * made subject to such option by the copyright holder.
3.43 +-->
3.44 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
3.45 +<html>
3.46 + <head>
3.47 + <title></title>
3.48 + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
3.49 + </head>
3.50 + <body>
3.51 + Convert <b>Lookup</b> to <b>ApplicationContext</b> and back!
3.52 + </body>
3.53 +</html>
4.1 --- a/spring.lookup/src/main/javadoc/org/apidesign/spring/package.html Thu Jun 07 20:34:55 2012 +0200
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,50 +0,0 @@
4.4 -<!--
4.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4.6 - *
4.7 - * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
4.8 - *
4.9 - * The contents of this file are subject to the terms of either the GNU
4.10 - * General Public License Version 2 only ("GPL") or the Common
4.11 - * Development and Distribution License("CDDL") (collectively, the
4.12 - * "License"). You may not use this file except in compliance with the
4.13 - * License. You can obtain a copy of the License at
4.14 - * http://www.netbeans.org/cddl-gplv2.html
4.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
4.16 - * specific language governing permissions and limitations under the
4.17 - * License. When distributing the software, include this License Header
4.18 - * Notice in each file and include the License file at
4.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
4.20 - * particular file as subject to the "Classpath" exception as provided
4.21 - * by Sun in the GPL Version 2 section of the License file that
4.22 - * accompanied this code. If applicable, add the following below the
4.23 - * License Header, with the fields enclosed by brackets [] replaced by
4.24 - * your own identifying information:
4.25 - * "Portions Copyrighted [year] [name of copyright owner]"
4.26 - *
4.27 - * Contributor(s):
4.28 - *
4.29 - * The Original Software is NetBeans. The Initial Developer of the Original
4.30 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
4.31 - * Microsystems, Inc. All Rights Reserved.
4.32 - *
4.33 - * If you wish your version of this file to be governed by only the CDDL
4.34 - * or only the GPL Version 2, indicate your decision by adding
4.35 - * "[Contributor] elects to include this software in this distribution
4.36 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
4.37 - * single choice of license, a recipient has the option to distribute
4.38 - * your version of this file under either the CDDL, the GPL Version 2 or
4.39 - * to extend the choice of license to its licensees as provided above.
4.40 - * However, if you add GPL Version 2 code and therefore, elected the GPL
4.41 - * Version 2 license, then the option applies only if the new code is
4.42 - * made subject to such option by the copyright holder.
4.43 --->
4.44 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
4.45 -<html>
4.46 - <head>
4.47 - <title></title>
4.48 - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4.49 - </head>
4.50 - <body>
4.51 - Convert <b>Lookup</b> to <b>ApplicationContext</b> and back!
4.52 - </body>
4.53 -</html>