Changeset 4324
- Timestamp:
- 01/23/14 14:48:14 (10 years ago)
- Location:
- DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend
- Files:
-
- 2 added
- 1 deleted
- 4 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/nb-configuration_old.xml
r4301 r4324 9 9 <spring-data xmlns="http://www.netbeans.org/ns/spring-data/1"> 10 10 <config-files> 11 <config-file>src/main/webapp/WEB-INF/web -shaa.xml</config-file>11 <config-file>src/main/webapp/WEB-INF/web_shaa.xml</config-file> 12 12 </config-files> 13 13 <config-file-groups/> -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml
r4301 r4324 13 13 </organization> 14 14 15 16 <dependencies> 17 <dependency> 18 <groupId>com.sun.jersey</groupId> 19 <artifactId>jersey-servlet</artifactId> 20 <version>${jersey.version}</version> 21 </dependency> 22 <dependency> 23 <groupId>com.sun.jersey</groupId> 24 <artifactId>jersey-json</artifactId> 25 <version>${jersey.version}</version> 26 <scope>test</scope> 27 </dependency> 28 <dependency> 29 <groupId>com.sun.jersey</groupId> 30 <artifactId>jersey-client</artifactId> 31 <version>${jersey.version}</version> 32 <scope>test</scope> 33 </dependency> 34 <dependency> 35 <groupId>com.sun.jersey.jersey-test-framework</groupId> 36 <artifactId>jersey-test-framework-grizzly2</artifactId> 37 <version>${jersey.version}</version> 38 </dependency> 39 <dependency> 40 <groupId>com.sun.jersey.contribs</groupId> 41 <artifactId>jersey-spring</artifactId> 42 <version>${jersey.version}</version> 43 <exclusions> 44 <exclusion> 45 <groupId>org.springframework</groupId> 46 <artifactId>*</artifactId> 47 </exclusion> 48 </exclusions> 49 </dependency> 50 <dependency> 51 <groupId>com.sun.jersey.contribs</groupId> 52 <artifactId>jersey-multipart</artifactId> 53 <version>${jersey.version}</version> 54 </dependency> 55 <dependency> 56 <groupId>org.jmock</groupId> 57 <artifactId>jmock-junit4</artifactId> 58 <version>2.5.1</version> 59 <scope>test</scope> 60 </dependency> 61 <dependency> 62 <groupId>org.springframework</groupId> 63 <artifactId>spring-jdbc</artifactId> 64 <version>${spring.version}</version> 65 </dependency> 66 <dependency> 67 <groupId>org.springframework</groupId> 68 <artifactId>spring-web</artifactId> 69 <version>${spring.version}</version> 70 </dependency> 71 <dependency> 72 <groupId>org.hsqldb</groupId> 73 <artifactId>hsqldb</artifactId> 74 <version>2.2.9</version> 75 <scope>test</scope> 76 <classifier>jdk5</classifier> 77 </dependency> 78 <dependency> 79 <groupId>commons-dbcp</groupId> 80 <artifactId>commons-dbcp</artifactId> 81 <version>1.4</version> 82 </dependency> 83 <dependency> 84 <groupId>org.springframework</groupId> 85 <artifactId>spring-test</artifactId> 86 <version>${spring.version}</version> 87 <scope>test</scope> 88 </dependency> 89 <dependency> 90 <groupId>commons-io</groupId> 91 <artifactId>commons-io</artifactId> 92 <version>2.2</version> 93 </dependency> 94 <dependency> 95 <groupId>postgresql</groupId> 96 <artifactId>postgresql</artifactId> 97 <version>8.4-702.jdbc4</version> 98 </dependency> 99 100 <dependency> 101 <groupId>cglib</groupId> 102 <artifactId>cglib</artifactId> 103 <version>2.2.2</version> 104 </dependency> 105 <dependency> 106 <groupId>org.slf4j</groupId> 107 <artifactId>slf4j-log4j12</artifactId> 108 <version>${slf4j.version}</version> 109 </dependency> 110 <dependency> 111 <groupId>de.mpg.mpgaai</groupId> 112 <artifactId>mpgaai-shhaa</artifactId> 113 <version>1.0.3</version> 114 <exclusions> 115 <exclusion> 116 <groupId>commons-logging</groupId> 117 <artifactId>commons-logging</artifactId> 118 </exclusion> 119 </exclusions> 120 </dependency> 121 </dependencies> 122 123 <profiles> 124 <profile> 125 <id>lux16</id> 126 <activation> 127 <activeByDefault>false</activeByDefault> 128 </activation> 129 <properties> 130 <webXmlPath>src/main/webapp/WEB-INF/web-shib.xml</webXmlPath> 131 <!-- web.xml for shibboleth authentication --> 132 </properties> 133 </profile> 134 135 </profiles> 136 137 15 138 <build> 16 139 <finalName>annotator-backend-${project.version}</finalName> … … 37 160 </plugin> 38 161 162 39 163 40 164 <plugin> … … 42 166 <artifactId>maven-war-plugin</artifactId> 43 167 <version>2.3</version> 168 <configuration> 169 <webXml>${webXmlPath}</webXml> 170 <webResources> 171 <resource> 172 <directory>src/main/webapp</directory> 173 <filtering>true</filtering> 174 <includes> 175 <include>WEB-INF/web-shib.xml</include> 176 </includes> 177 </resource> 178 </webResources> 179 </configuration> 44 180 </plugin> 45 181 … … 143 279 </mapping> 144 280 <excludes> 145 <exclude>nbactions .xml</exclude>146 <exclude>nb-configuration .xml</exclude>281 <exclude>nbactions*</exclude> 282 <exclude>nb-configuration*</exclude> 147 283 <exclude>**/*.txt</exclude> 148 284 <exclude>src/main/resources/xml.xsd</exclude> … … 163 299 </plugin> 164 300 </plugins> 165 </build> 166 <dependencies> 167 <dependency> 168 <groupId>com.sun.jersey</groupId> 169 <artifactId>jersey-servlet</artifactId> 170 <version>${jersey.version}</version> 171 </dependency> 172 <dependency> 173 <groupId>com.sun.jersey</groupId> 174 <artifactId>jersey-json</artifactId> 175 <version>${jersey.version}</version> 176 <scope>test</scope> 177 </dependency> 178 <dependency> 179 <groupId>com.sun.jersey</groupId> 180 <artifactId>jersey-client</artifactId> 181 <version>${jersey.version}</version> 182 <scope>test</scope> 183 </dependency> 184 <dependency> 185 <groupId>com.sun.jersey.jersey-test-framework</groupId> 186 <artifactId>jersey-test-framework-grizzly2</artifactId> 187 <version>${jersey.version}</version> 188 </dependency> 189 <dependency> 190 <groupId>com.sun.jersey.contribs</groupId> 191 <artifactId>jersey-spring</artifactId> 192 <version>${jersey.version}</version> 193 <exclusions> 194 <exclusion> 195 <groupId>org.springframework</groupId> 196 <artifactId>*</artifactId> 197 </exclusion> 198 </exclusions> 199 </dependency> 200 <dependency> 201 <groupId>com.sun.jersey.contribs</groupId> 202 <artifactId>jersey-multipart</artifactId> 203 <version>${jersey.version}</version> 204 </dependency> 205 <dependency> 206 <groupId>org.jmock</groupId> 207 <artifactId>jmock-junit4</artifactId> 208 <version>2.5.1</version> 209 <scope>test</scope> 210 </dependency> 211 <dependency> 212 <groupId>org.springframework</groupId> 213 <artifactId>spring-jdbc</artifactId> 214 <version>${spring.version}</version> 215 </dependency> 216 <dependency> 217 <groupId>org.springframework</groupId> 218 <artifactId>spring-web</artifactId> 219 <version>${spring.version}</version> 220 </dependency> 221 <dependency> 222 <groupId>org.hsqldb</groupId> 223 <artifactId>hsqldb</artifactId> 224 <version>2.2.9</version> 225 <scope>test</scope> 226 <classifier>jdk5</classifier> 227 </dependency> 228 <dependency> 229 <groupId>commons-dbcp</groupId> 230 <artifactId>commons-dbcp</artifactId> 231 <version>1.4</version> 232 </dependency> 233 <dependency> 234 <groupId>org.springframework</groupId> 235 <artifactId>spring-test</artifactId> 236 <version>${spring.version}</version> 237 <scope>test</scope> 238 </dependency> 239 <dependency> 240 <groupId>commons-io</groupId> 241 <artifactId>commons-io</artifactId> 242 <version>2.2</version> 243 </dependency> 244 <dependency> 245 <groupId>postgresql</groupId> 246 <artifactId>postgresql</artifactId> 247 <version>8.4-702.jdbc4</version> 248 </dependency> 249 <!-- <dependency> 250 <groupId>org.springframework.security</groupId> 251 <artifactId>spring-security-core</artifactId> 252 <version>${spring.version}</version> 253 </dependency> 254 <dependency> 255 <groupId>org.springframework.security</groupId> 256 <artifactId>spring-security-config</artifactId> 257 <version>${spring.version}</version> 258 </dependency> 259 <dependency> 260 <groupId>org.springframework.security</groupId> 261 <artifactId>spring-security-web</artifactId> 262 <version>${spring.version}</version> 263 </dependency> --> 264 <dependency> 265 <groupId>cglib</groupId> 266 <artifactId>cglib</artifactId> 267 <version>2.2.2</version> 268 </dependency> 269 <dependency> 270 <groupId>org.slf4j</groupId> 271 <artifactId>slf4j-log4j12</artifactId> 272 <version>${slf4j.version}</version> 273 </dependency> 274 <dependency> 275 <groupId>de.mpg.mpgaai</groupId> 276 <artifactId>mpgaai-shhaa</artifactId> 277 <version>1.0.3</version> 278 <exclusions> 279 <exclusion> 280 <groupId>commons-logging</groupId> 281 <artifactId>commons-logging</artifactId> 282 </exclusion> 283 </exclusions> 284 </dependency> 285 </dependencies> 286 287 <profiles> 288 <profile> 289 <id>lux16</id> 290 <properties> 291 <serviceRootUrl>http://lux16.mpi.nl/ds/webannotator/</serviceRootUrl> 292 <!-- Will be inserted in context.xml --> 293 <shibLI>http://lux16.mpi.nl/Shibboleth.sso/Login</shibLI> 294 <!-- Shibboleth login URI for SHHAA --> 295 <shibLO>http://lux16.mpi.nl/Shibboleth.sso/Logout</shibLO> 296 <!-- Shibboleth logout URI for SHHAA --> 297 <webXmlPath>src/main/webapp/WEB-INF/web-shib.xml</webXmlPath> 298 <!-- web.xml for shibboleth authentication --> 299 </properties> 300 </profile> 301 302 <profile> 303 <id>lux17</id> 304 <properties> 305 <serviceRootUrl>http://lux17.mpi.nl/ds/webannotator/</serviceRootUrl> 306 <!-- Will be inserted in context.xml --> 307 <shibLI>http://lux17.mpi.nl/Shibboleth.sso/Login</shibLI> 308 <!-- Shibboleth login URI for SHHAA --> 309 <shibLO>http://lux17.mpi.nl/Shibboleth.sso/Logout</shibLO> 310 <!-- Shibboleth logout URI for SHHAA --> 311 <webXmlPath>src/main/webapp/WEB-INF/web-shib.xml</webXmlPath> 312 <!-- web.xml for shibboleth authentication --> 313 </properties> 314 </profile> 315 316 <profile> 317 <id>localhost</id> 318 <activation> 319 <activeByDefault>true</activeByDefault> 320 </activation> 321 <properties> 322 <serviceRootUrl>localhost:8080/annotator-backend/api/</serviceRootUrl> 323 <webXmlPath>src/main/webapp/WEB-INF/web.xml</webXmlPath> 324 </properties> 325 </profile> 326 </profiles> 327 301 </build> 302 328 303 <properties> 329 304 <jersey.version>1.17.1</jersey.version> -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/META-INF/context.xml
r4211 r4324 20 20 --> 21 21 <Context antiJARLocking="true" path="/annotator-backend"> 22 <Resource 23 name="jdbc/DASISHAnnotator" 24 auth="Container" 25 type="javax.sql.DataSource" 26 driverClassName="org.postgresql.Driver" 27 url="jdbc:postgresql:annotator" 28 username="dasish" 29 password="dasish" 30 maxActive="10" 31 maxIdle="5" 32 maxWait="4000" 33 removeAbandoned="false" 34 removeAbandonedTimeout="10" 35 logAbandoned="true" /> 22 <Resource auth="Container" driverClassName="org.postgresql.Driver" logAbandoned="true" maxActive="10" maxIdle="5" maxWait="4000" name="jdbc/DASISHAnnotator" password="dasish" removeAbandoned="false" removeAbandonedTimeout="10" type="javax.sql.DataSource" url="jdbc:postgresql:annotator" username="dasish"/> 36 23 </Context> -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/shhaa.xml
r4257 r4324 39 39 <username>anonymous</username> 40 40 </fallback> 41 <sso action="lI"> ${shibLI}</sso>42 <slo action="lO">${shibLO}</slo>41 <sso action="lI">http://lux16.mpi.nl/Shibboleth.sso/Login</sso> 42 <slo action="lO">http://lux16.mpi.nl/Shibboleth.sso/Logout</slo> 43 43 </authentication> 44 44 -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml
r4281 r4324 22 22 see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html#d4e194 --> 23 23 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> 24 <context-param> 25 <param-name>ShhaaConfigLocation</param-name> 26 <param-value>/WEB-INF/shhaa.xml</param-value> 27 </context-param> 28 29 24 30 <context-param> 25 31 <param-name>contextConfigLocation</param-name> … … 64 70 <url-pattern>/api/*</url-pattern> 65 71 </servlet-mapping> 66 <!-- <servlet-mapping> 67 <servlet-name>ServletAdaptor</servlet-name> 68 <url-pattern>/webresources/*</url-pattern> 69 </servlet-mapping>--> 72 70 73 <servlet-mapping> 71 74 <servlet-name>ServletAdaptor</servlet-name> … … 96 99 <role-name>tomcat</role-name> 97 100 </security-role> 101 98 102 </web-app>
Note: See TracChangeset
for help on using the changeset viewer.