Changeset 2366
- Timestamp:
- 11/22/12 10:52:52 (12 years ago)
- Location:
- ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/pom.xml
r2134 r2366 30 30 <dependencies> 31 31 <dependency> 32 <groupId>junit</groupId>33 <artifactId>junit</artifactId>34 <version>4.4</version>35 <scope>test</scope>36 </dependency>37 <dependency>38 32 <groupId>net.sf.saxon</groupId> 39 33 <artifactId>Saxon-HE</artifactId> … … 87 81 </dependency> 88 82 <dependency> 89 <groupId>org.springframework</groupId> 90 <artifactId>spring</artifactId> 91 <version>2.5.6</version> 92 </dependency> 83 <groupId>com.sun.xml.stream</groupId> 84 <artifactId>sjsxp</artifactId> 85 <version>1.0.1</version> 86 </dependency> 87 <dependency> 88 <groupId>de.mpg.mpgaai</groupId> 89 <artifactId>mpgaai-jaas</artifactId> 90 <version>1.3.2</version> 91 </dependency> 92 <dependency> 93 <groupId>de.mpg.mpgaai</groupId> 94 <artifactId>mpgaai-shhaa</artifactId> 95 <version>1.0.2</version> 96 </dependency> 97 <dependency> 98 <groupId>commons-dbcp</groupId> 99 <artifactId>commons-dbcp</artifactId> 100 <version>1.4</version> 101 </dependency> 102 <dependency> 103 <groupId>postgresql</groupId> 104 <artifactId>postgresql</artifactId> 105 <version>8.4-701.jdbc4</version> 106 </dependency> 107 <dependency> 108 <groupId>hsqldb</groupId> 109 <artifactId>hsqldb</artifactId> 110 <version>1.8.0.10</version> 111 <scope>test</scope> 112 </dependency> 113 114 <dependency> 115 <groupId>clarin.cmdi</groupId> 116 <artifactId>cmd-validate</artifactId> 117 <version>1.1</version> 118 </dependency> 119 120 <!-- Wicket --> 121 122 <dependency> 123 <groupId>org.apache.wicket</groupId> 124 <artifactId>wicket</artifactId> 125 <version>1.4.8</version> 126 </dependency> 127 <dependency> 128 <groupId>org.apache.wicket</groupId> 129 <artifactId>wicket-extensions</artifactId> 130 <version>1.4.8</version> 131 </dependency> 132 133 <!-- Jersey --> 134 93 135 <dependency> 94 136 <groupId>com.sun.jersey.contribs</groupId> 95 137 <artifactId>jersey-multipart</artifactId> 96 <version>1.1 2</version>138 <version>1.15</version> 97 139 </dependency> 98 140 <dependency> 99 141 <groupId>com.sun.jersey</groupId> 100 142 <artifactId>jersey-bundle</artifactId> 101 <version>1.1 2</version>143 <version>1.15</version> 102 144 <exclusions> 103 145 <!-- … … 114 156 <groupId>com.sun.jersey.jersey-test-framework</groupId> 115 157 <artifactId>jersey-test-framework-grizzly</artifactId> 116 <version>1.1 2</version>158 <version>1.15</version> 117 159 <scope>test</scope> 118 160 </dependency> … … 120 162 <groupId>com.sun.grizzly</groupId> 121 163 <artifactId>grizzly-servlet-webserver</artifactId> 122 <version>1.9. 19</version>164 <version>1.9.54</version> 123 165 <scope>test</scope> 124 166 </dependency> 125 <dependency> 126 <groupId>com.sun.xml.stream</groupId> 127 <artifactId>sjsxp</artifactId> 128 <version>1.0.1</version> 129 </dependency> 130 <dependency> 131 <groupId>de.mpg.mpgaai</groupId> 132 <artifactId>mpgaai-jaas</artifactId> 133 <version>1.3.2</version> 134 </dependency> 135 <dependency> 136 <groupId>de.mpg.mpgaai</groupId> 137 <artifactId>mpgaai-shhaa</artifactId> 138 <version>1.0.2</version> 139 </dependency> 140 <dependency> 141 <groupId>org.apache.wicket</groupId> 142 <artifactId>wicket</artifactId> 143 <version>1.4.8</version> 144 </dependency> 145 <dependency> 146 <groupId>org.apache.wicket</groupId> 147 <artifactId>wicket-extensions</artifactId> 148 <version>1.4.8</version> 149 </dependency> 167 168 <!-- Spring --> 169 170 <dependency> 171 <groupId>org.springframework</groupId> 172 <artifactId>spring-core</artifactId> 173 <version>3.1.2.RELEASE</version> 174 </dependency> 175 <dependency> 176 <groupId>org.springframework</groupId> 177 <artifactId>spring-context</artifactId> 178 <version>3.1.2.RELEASE</version> 179 </dependency> 180 <dependency> 181 <groupId>org.springframework</groupId> 182 <artifactId>spring-beans</artifactId> 183 <version>3.1.2.RELEASE</version> 184 </dependency> 185 186 <dependency> 187 <groupId>org.springframework</groupId> 188 <artifactId>spring-web</artifactId> 189 <version>3.1.2.RELEASE</version> 190 </dependency> 191 <dependency> 192 <groupId>org.springframework</groupId> 193 <artifactId>spring-webmvc</artifactId> 194 <version>3.1.2.RELEASE</version> 195 </dependency> 196 <dependency> 197 <groupId>org.springframework.security</groupId> 198 <artifactId>spring-security-core</artifactId> 199 <version>3.1.2.RELEASE</version> 200 </dependency> 201 <dependency> 202 <groupId>org.springframework.security</groupId> 203 <artifactId>spring-security-web</artifactId> 204 <version>3.1.2.RELEASE</version> 205 </dependency> 206 <dependency> 207 <groupId>org.springframework.security</groupId> 208 <artifactId>spring-security-config</artifactId> 209 <version>3.1.2.RELEASE</version> 210 </dependency> 211 <dependency> 212 <groupId>org.springframework.security.oauth</groupId> 213 <artifactId>spring-security-oauth2</artifactId> 214 <version>1.0.0.RC3</version> <!-- from spring-milestone repository below --> 215 <exclusions> 216 <exclusion> 217 <groupId>org.springframework</groupId> 218 <artifactId>spring-beans</artifactId> 219 </exclusion> 220 <exclusion> 221 <groupId>org.springframework</groupId> 222 <artifactId>spring-context</artifactId> 223 </exclusion> 224 <exclusion> 225 <groupId>org.springframework</groupId> 226 <artifactId>spring-core</artifactId> 227 </exclusion> 228 </exclusions> 229 </dependency> 230 231 <dependency> 232 <groupId>org.springframework</groupId> 233 <artifactId>spring-test</artifactId> 234 <version>3.1.2.RELEASE</version> 235 <scope>test</scope> 236 </dependency> 237 238 <!-- Jersey spring --> 239 240 <dependency> 241 <groupId>com.sun.jersey.contribs</groupId> 242 <artifactId>jersey-spring</artifactId> 243 <version>1.15</version> 244 <exclusions> 245 <!-- 246 This version of jersey-spring depends on an older version of Spring but it is compatible with the desired version 247 of Spring (at least for the current purposes) 248 --> 249 <exclusion> 250 <groupId>org.springframework</groupId> 251 <artifactId>spring</artifactId> 252 </exclusion> 253 <exclusion> 254 <groupId>org.springframework</groupId> 255 <artifactId>spring-core</artifactId> 256 </exclusion> 257 <exclusion> 258 <groupId>org.springframework</groupId> 259 <artifactId>spring-web</artifactId> 260 </exclusion> 261 <exclusion> 262 <groupId>org.springframework</groupId> 263 <artifactId>spring-beans</artifactId> 264 </exclusion> 265 <exclusion> 266 <groupId>org.springframework</groupId> 267 <artifactId>spring-context</artifactId> 268 </exclusion> 269 </exclusions> 270 </dependency> 271 272 <!-- Wicket spring --> 273 150 274 <dependency> 151 275 <groupId>org.apache.wicket</groupId> … … 159 283 </exclusions> 160 284 </dependency> 161 <dependency> 162 <groupId>com.sun.jersey.contribs</groupId> 163 <artifactId>jersey-spring</artifactId> 164 <version>1.12</version> 165 </dependency> 166 <dependency> 167 <groupId>org.springframework</groupId> 168 <artifactId>spring-test</artifactId> 169 <version>2.5.6</version> 170 <scope>test</scope> 171 </dependency> 172 <dependency> 173 <groupId>commons-dbcp</groupId> 174 <artifactId>commons-dbcp</artifactId> 175 <version>1.4</version> 176 </dependency> 177 <dependency> 178 <groupId>postgresql</groupId> 179 <artifactId>postgresql</artifactId> 180 <version>8.4-701.jdbc4</version> 181 </dependency> 182 <dependency> 183 <groupId>hsqldb</groupId> 184 <artifactId>hsqldb</artifactId> 185 <version>1.8.0.10</version> 186 <scope>test</scope> 187 </dependency> 188 <dependency> 189 <groupId>clarin.cmdi</groupId> 190 <artifactId>cmd-validate</artifactId> 191 <version>1.1</version> 192 </dependency> 285 193 286 </dependencies> 194 287 … … 413 506 <url>https://oss.sonatype.org/content/groups/public</url> 414 507 </repository> 508 <!-- spring-security-oauth2 is not yet officialy released --> 509 <repository> 510 <id>spring-milestone</id> 511 <url>http://maven.springframework.org/milestone/</url> 512 </repository> 415 513 </repositories> 514 416 515 </project> -
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/webresources/WEB-INF/spring-config/component-registry.xml
r2261 r2366 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans- 2.5.xsd">4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.0.xsd"> 5 5 6 6 <!-- -
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/webresources/WEB-INF/spring-config/database-impl.xml
r1947 r2366 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans- 2.5.xsd">4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.0.xsd"> 5 5 6 6 <import resource="datasource-jdbc.xml"/> -
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/webresources/WEB-INF/spring-config/datasource-jdbc.xml
r1947 r2366 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans- 2.5.xsd">4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.0.xsd"> 5 5 6 6 <!-- Using the Datasource JNDI defined in the servlet container. See below for a sample Tomcat datasource configuration --> -
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/webresources/WEB-INF/spring-config/persistence.xml
r1947 r2366 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans- 2.5.xsd">4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.0.xsd"> 5 5 6 6 <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager"> -
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/test/resources/spring-config/component-registry.xml
r1944 r2366 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans- 2.5.xsd">4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.0.xsd"> 5 5 6 6 <bean id="configuration" class="clarin.cmdi.componentregistry.Configuration" factory-method="getInstance"> -
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/test/resources/spring-config/database-impl.xml
r1944 r2366 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans- 2.5.xsd">4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.0.xsd"> 5 5 6 6 <!-- <import resource="datasource-jdbc.xml"/>--> -
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/test/resources/spring-config/datasource-hsqldb.xml
r1944 r2366 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-2.5.xsd"> 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.0.xsd"> 5 5 6 <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"> 6 7 <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> -
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/test/resources/spring-config/datasource-jdbc.xml
r1944 r2366 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-2.5.xsd"> 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.0.xsd"> 5 5 6 <!-- <bean id="dataSource" destroy-method="close" class="org.apache.commons.dbcp.BasicDataSource"> 6 7 <property name="driverClassName" value="${jdbc.driverClassName}"/> -
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/test/resources/spring-config/persistence.xml
r1944 r2366 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-2.5.xsd"> 4 xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.0.xsd"> 5 5 6 <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager"> 6 7 <property name="dataSource" ref="dataSource"/>
Note: See TracChangeset
for help on using the changeset viewer.