Changeset 1543


Ignore:
Timestamp:
09/20/11 14:19:52 (13 years ago)
Author:
twagoo
Message:

Tidied up configuration: use JNDI datasource, removed unused RegistryRoot? property from pom, comments in web.xml variants

Location:
ComponentRegistry/trunk/ComponentRegistry
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • ComponentRegistry/trunk/ComponentRegistry/pom.xml

    r1419 r1543  
    197197        <registryRoot>${user.home}/ComponentRegistry</registryRoot>
    198198        <ComponentRegistrySwfName>${pom.artifactId}-${ComponentBrowserGui.version}</ComponentRegistrySwfName>
    199         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
    200199        <flexDebug>0</flexDebug>
    201200    </properties>
    … …  
    206205            <properties>
    207206                <serviceRootUrl>http://lux16.mpi.nl/ds/ComponentRegistry</serviceRootUrl>
    208                 <registryRoot>/tmp/ComponentRegistry</registryRoot>
    209207                <webXmlPath>src/main/webapp/WEB-INF/web-shib.xml</webXmlPath>
    210208            </properties>
    … …  
    214212            <properties>
    215213                <serviceRootUrl>http://catalog.clarin.eu/ds/ComponentRegistry</serviceRootUrl>
    216                 <registryRoot>/lat/ComponentRegistry</registryRoot>
    217214                <webXmlPath>src/main/webapp/WEB-INF/web-shib.xml</webXmlPath>
    218215            </properties>

  • ComponentRegistry/trunk/ComponentRegistry/src/main/webapp/WEB-INF/web-shib.xml

    r1280 r1543  
    11<?xml version="1.0" encoding="UTF-8"?>
     2
     3<!--
     4        Configuration file for ComponentRegistry in shibbolized context, which
     5        any production environment should be.
     6-->
     7
    28<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    39  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">

  • ComponentRegistry/trunk/ComponentRegistry/src/main/webapp/WEB-INF/web.xml

    r1280 r1543  
    11<?xml version="1.0" encoding="UTF-8"?>
     2<!--
     3        Configuration file for ComponentRegistry in NON-SHIBBOLIZED context,
     4        i.e. development or testing environments.
     5-->
     6
    27<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
    38    <display-name>ComponentRegistry</display-name>

  • ComponentRegistry/trunk/ComponentRegistry/src/main/webresources/WEB-INF/spring-config/datasource-jdbc.xml

    r1397 r1543  
    55       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
    66">
    7 <!--    <bean id="dataSource" destroy-method="close" class="org.apache.commons.dbcp.BasicDataSource">
    8         <property name="driverClassName" value="${jdbc.driverClassName}"/>
    9         <property name="url" value="${jdbc.url}"/>
    10         <property name="username" value="${jdbc.username}"/>
    11         <property name="password" value="${jdbc.password}"/>
    12     </bean>-->
    137
    14     <bean id="dataSource" destroy-method="close" class="org.apache.commons.dbcp.BasicDataSource">
    15         <property name="driverClassName" value="org.postgresql.Driver"/>
    16         <property name="url" value="jdbc:postgresql:component_registry"/>
    17         <property name="username" value="compreg"/>
    18         <property name="password" value="compreg"/>
     8    <!-- Using the Datasource JNDI defined in the servlet container. See below for a sample Tomcat datasource configuration -->
     9
     10    <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
     11        <property name="jndiName" value="java:comp/env/jdbc/ComponentRegistry"/>   
     12        <property name="resourceRef" value="true" />
    1913    </bean>
     14   
     15    <!--
     16       
     17    SAMPLE TOMCAT DATASOURCE CONFIGURATION:
     18   
     19    <Context>
     20        ...
     21        <Resource
     22            name="jdbc/ComponentRegistry"
     23            auth="Container"
     24            type="javax.sql.DataSource"
     25            driverClassName="org.postgresql.Driver"
     26            url="jdbc:postgresql:component_registry"
     27            username="compreg"
     28            password="compreg"
     29            maxActive="10"
     30            maxIdle="5"
     31            maxWait="4000"
     32            removeAbandoned="false"
     33            removeAbandonedTimeout="10"
     34            logAbandoned="true" />
     35        ...
     36    </Context>
     37
     38    -->
    2039
    2140</beans>
Note: See TracChangeset for help on using the changeset viewer.