Changeset 714


Ignore:
Timestamp:
04/30/11 17:39:33 (8 years ago)
Author:
philsmart
Message:
 
Location:
raptor-ica-embedded/trunk
Files:
4 added
8 deleted
6 edited
5 copied
1 moved

Legend:

Unmodified
Added
Removed
  • raptor-ica-embedded/trunk/pom.xml

    r685 r714  
    8282        <properties> 
    8383                <jetty.version>6.1.23</jetty.version> 
    84                  <apache.cxf.version>2.2.7</apache.cxf.version> 
     84                 <apache.cxf.version>2.2.8</apache.cxf.version> 
    8585        <spring.version>3.0.2.RELEASE</spring.version> 
    8686        </properties> 
     
    290290                </dependency> 
    291291                 
     292                <dependency> 
     293                        <groupId>commons-lang</groupId> 
     294                        <artifactId>commons-lang</artifactId> 
     295                        <version>2.6</version> 
     296                </dependency> 
    292297        </dependencies> 
    293298 
  • raptor-ica-embedded/trunk/src/main/config/data-access.xml

    r712 r714  
    4646                                </bean> 
    4747 
    48                 --><!--  EZPROXY--> 
     48                --><!--  EZPROXY 
    4949 
    5050               <bean id="ezproxyLFP" class="uk.ac.cardiff.raptor.raptorica.dao.external.file.LogFileParser"> 
     
    6565                       </bean> 
    6666                    </property> 
    67                 </bean> 
    68  
    69  
    70  
    71                                 <!-- Shibboleth 2 
     67                </bean>--> 
     68 
     69 
     70 
     71                                <!-- Shibboleth 2 --> 
    7272 
    7373                <bean id="shibbolethAuditLFP" class="uk.ac.cardiff.raptor.raptorica.dao.external.file.LogFileParser"> 
     
    9898                                        </property> 
    9999 
    100                                 </bean>--> 
     100                                </bean> 
    101101                        </list> 
    102102                </property> 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/engine/DataAccessRegister.java

    r628 r714  
    2222import java.util.List; 
    2323 
    24 import org.apache.log4j.Logger; 
     24import org.slf4j.Logger; 
     25import org.slf4j.LoggerFactory; 
    2526 
    26 import uk.ac.cardiff.raptor.raptorica.dao.BaseEventParser; 
     27 
     28 
     29import uk.ac.cardiff.raptor.raptorica.parse.BaseEventParser; 
    2730 
    2831/** 
     
    3437 
    3538        /** Class logger */ 
    36         private final Logger log = Logger.getLogger(DataAccessRegister.class); 
     39        private final Logger log = LoggerFactory.getLogger(DataAccessRegister.class); 
    3740 
    3841        /** List of parsing modules */ 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/engine/ICAEngine.java

    r670 r714  
    2222import java.util.List; 
    2323 
    24 import uk.ac.cardiff.raptor.raptorica.dao.BaseEventParser; 
     24import uk.ac.cardiff.raptor.raptorica.parse.BaseEventParser; 
    2525import uk.ac.cardiff.raptor.remoting.client.EventReleaseClient; 
    2626import uk.ac.cardiff.raptor.remoting.client.ReleaseFailureException; 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/parse/BaseEventParser.java

    r713 r714  
    1717 * 
    1818 */ 
    19 package uk.ac.cardiff.raptor.raptorica.dao; 
     19package uk.ac.cardiff.raptor.raptorica.parse; 
    2020 
    2121import java.util.List; 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/parse/external/file/LogFileParser.java

    r713 r714  
    1414 * limitations under the License. 
    1515 */ 
    16 package uk.ac.cardiff.raptor.raptorica.dao.external.file; 
     16package uk.ac.cardiff.raptor.raptorica.parse.external.file; 
    1717 
    1818import java.io.BufferedReader; 
     
    3434import java.io.BufferedInputStream; 
    3535 
    36 import uk.ac.cardiff.raptor.raptorica.dao.BaseEventParser; 
    37 import uk.ac.cardiff.raptor.raptorica.dao.external.format.Header; 
    38 import uk.ac.cardiff.raptor.raptorica.dao.external.format.LineFilter; 
    39 import uk.ac.cardiff.raptor.raptorica.dao.external.format.LogFileFormat; 
    4036import uk.ac.cardiff.raptor.raptorica.model.exception.HeaderException; 
    4137import uk.ac.cardiff.raptor.raptorica.model.exception.ParserException; 
     
    5147import org.slf4j.LoggerFactory; 
    5248 
     49import uk.ac.cardiff.raptor.raptorica.parse.BaseEventParser; 
     50import uk.ac.cardiff.raptor.raptorica.parse.external.format.Header; 
     51import uk.ac.cardiff.raptor.raptorica.parse.external.format.LineFilter; 
     52import uk.ac.cardiff.raptor.raptorica.parse.external.format.LogFileFormat; 
    5353import uk.ac.cardiff.raptor.raptorica.runtimeutils.ReflectionHelper; 
    5454import uk.ac.cardiff.model.event.Event; 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/parse/external/format/ContainsLineFilter.java

    r713 r714  
    1717 * 
    1818 */ 
    19 package uk.ac.cardiff.raptor.raptorica.dao.external.format; 
     19package uk.ac.cardiff.raptor.raptorica.parse.external.format; 
    2020 
    2121import org.slf4j.Logger; 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/parse/external/format/Header.java

    r713 r714  
    1717 * 
    1818 */ 
    19 package uk.ac.cardiff.raptor.raptorica.dao.external.format; 
     19package uk.ac.cardiff.raptor.raptorica.parse.external.format; 
    2020 
    2121import java.util.Map; 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/parse/external/format/LineFilter.java

    r713 r714  
    1717 * 
    1818 */ 
    19 package uk.ac.cardiff.raptor.raptorica.dao.external.format; 
     19package uk.ac.cardiff.raptor.raptorica.parse.external.format; 
    2020 
    2121/** 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/parse/external/format/LogFileFormat.java

    r713 r714  
    1717 * 
    1818 */ 
    19 package uk.ac.cardiff.raptor.raptorica.dao.external.format; 
     19package uk.ac.cardiff.raptor.raptorica.parse.external.format; 
    2020 
    2121import java.util.List; 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/runtimeutils/ReflectionHelper.java

    r617 r714  
    2424import org.slf4j.LoggerFactory; 
    2525 
    26 import uk.ac.cardiff.raptor.raptorica.dao.external.file.LogFileParser; 
     26import uk.ac.cardiff.raptor.raptorica.parse.external.file.LogFileParser; 
    2727 
    2828 
  • raptor-ica-embedded/trunk/src/main/java/uk/ac/cardiff/raptor/raptorica/server/RunServer.java

    r695 r714  
    5353        public static void main(String args[]) throws FileNotFoundException, IOException { 
    5454                System.setProperty("org.apache.cxf.Logger", "org.apache.cxf.common.logging.Slf4jLogger"); 
     55                 
    5556 
    5657                String configurationFiles = System.getProperty("configurationFiles", System.getProperty("user.dir") + "/target/conf"); 
Note: See TracChangeset for help on using the changeset viewer.