Changeset 4


Ignore:
Timestamp:
09/26/11 10:41:31 (8 years ago)
Author:
philsmart
Message:
 
Location:
wayfless-url-generator/trunk
Files:
7 added
4 edited

Legend:

Unmodified
Added
Removed
  • wayfless-url-generator/trunk/pom.xml

    r3 r4  
    126126 
    127127    <dependencies> 
     128 
     129 
     130        <!-- Open SAML --> 
     131 
     132 
     133        <dependency> 
     134            <groupId>org.opensaml</groupId> 
     135            <artifactId>opensaml</artifactId> 
     136            <version>2.4.0</version> 
     137            <exclusions> 
     138                <exclusion> 
     139                    <artifactId>log4j-over-slf4j</artifactId> 
     140                    <groupId>org.slf4j</groupId> 
     141                </exclusion> 
     142                <exclusion> 
     143                    <artifactId>slf4j-api</artifactId> 
     144                    <groupId>org.slf4j</groupId> 
     145                </exclusion> 
     146                <exclusion> 
     147                    <artifactId>jcl-over-slf4j</artifactId> 
     148                    <groupId>org.slf4j</groupId> 
     149                </exclusion> 
     150                <exclusion> 
     151                    <artifactId>jul-to-slf4j</artifactId> 
     152                    <groupId>org.slf4j</groupId> 
     153                </exclusion> 
     154            </exclusions> 
     155        </dependency> 
     156         
    128157        <!-- RICHFACES --> 
    129158        <dependency> 
     
    534563        </dependency> 
    535564 
    536          
    537          <dependency> 
     565 
     566        <dependency> 
    538567            <groupId>javax.transaction</groupId> 
    539568            <artifactId>jta</artifactId> 
     
    575604            <scope>test</scope> 
    576605        </dependency> 
    577         
     606 
    578607    </dependencies> 
    579608 
  • wayfless-url-generator/trunk/src/main/java/uk/ac/cardiff/wugen/generator/model/WugModel.java

    r3 r4  
    1818    } 
    1919 
     20    public void setId(Integer id) { 
     21        this.id = id; 
     22    } 
     23 
    2024} 
  • wayfless-url-generator/trunk/src/main/webapp/WEB-INF/config/database.xml

    r3 r4  
    2828                        </props> 
    2929                </property> 
    30                 <property name="packagesToScan" value="uk.ac.cardiff.wugen.model"/>              
     30                <property name="packagesToScan" value="uk.ac.cardiff.wugen.generator.model"/>            
    3131        </bean> 
    3232 
     
    6464 
    6565 
    66         <bean name="dataConnectionImpl" class="uk.ac.cardiff.wugen.dao.impl.DefaultWugDao"> 
     66        <bean name="dataConnectionImpl" class="uk.ac.cardiff.wugen.generator.dao.impl.DefaultWugDao"> 
    6767                <property name="sessionFactory" ref="sessionFactory" /> 
    6868        </bean>  
  • wayfless-url-generator/trunk/src/main/webapp/WEB-INF/flows/generate/generate-flow.xml

    r3 r4  
    1 <!-- 
    2  
    3     Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
    4  
    5     Licensed under the Apache License, Version 2.0 (the "License"); 
    6     you may not use this file except in compliance with the License. 
    7     You may obtain a copy of the License at 
    8  
    9             http://www.apache.org/licenses/LICENSE-2.0 
    10  
    11     Unless required by applicable law or agreed to in writing, software 
    12     distributed under the License is distributed on an "AS IS" BASIS, 
    13     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
    14     See the License for the specific language governing permissions and 
    15     limitations under the License. 
    16  
    17 --> 
    18 <flow xmlns="http://www.springframework.org/schema/webflow" 
    19         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    20         xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd"> 
     1<!-- Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> Licensed under the Apache License, Version 2.0 (the "License");  
     2    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  
     3    Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS  
     4    IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language  
     5    governing permissions and limitations under the License. --> 
     6<flow xmlns="http://www.springframework.org/schema/webflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     7    xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd"> 
    218 
    229 
    2310 
    24         <view-state id="generatorStart" view="generatorStart.xhtml"> 
     11    <view-state id="generatorStart" view="generatorStart.xhtml"> 
    2512 
    26                  
    27         </view-state> 
    2813 
    29          
     14    </view-state> 
     15 
     16 
     17    <view-state id="wayfIdpSelector" view="wayfIdpSelector.xhtml"> 
     18 
     19 
     20    </view-state> 
     21 
     22    <view-state id="spSelector" view="spSelector.xhtml"> 
     23 
     24 
     25    </view-state> 
     26 
     27 
     28    <view-state id="wugResults" view="wugResults.xhtml"> 
     29 
     30 
     31    </view-state> 
     32 
     33    <view-state id="admin" view="admin.xhtml"> 
     34 
     35 
     36    </view-state> 
     37 
     38 
     39 
     40 
    3041 
    3142 
Note: See TracChangeset for help on using the changeset viewer.