Changeset 1354
- Timestamp:
- 01/15/12 21:29:52 (16 months ago)
- Location:
- raptor-ica/trunk
- Files:
-
- 4 edited
-
pom.xml (modified) (1 diff)
-
src/main/config/event-parse-formats-custom.xml (modified) (1 diff)
-
src/main/config/event-parse.xml (modified) (3 diffs)
-
src/main/config/logging.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
raptor-ica/trunk/pom.xml
r1349 r1354 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 2 <modelVersion>4.0.0</modelVersion> 3 <groupId>uk.ac.cardiff.raptor</groupId> 4 <artifactId>raptor-ica</artifactId> 5 <version>1.0.2-SNAPSHOT</version> 6 <name>Raptor Information Collector Agent</name> 7 <description> </description> 8 9 10 11 <licenses> 12 <license> 13 <name>Apache 2</name> 14 <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> 15 <distribution>repo</distribution> 16 </license> 17 </licenses> 18 19 <!-- Adding extra repositories for any other libs, which is hosted on Iam --> 20 <repositories> 21 <repository> 22 <releases> 23 <enabled>true</enabled> 24 </releases> 25 <snapshots> 26 <enabled>true</enabled> 27 <updatePolicy>always</updatePolicy> 28 </snapshots> 29 <id>raptor-extras-repo</id> 30 <name>Iam Local Maven Repo</name> 31 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-extra</url> 32 <layout>default</layout> 33 </repository> 34 <repository> 35 <releases> 36 <enabled>true</enabled> 37 </releases> 38 <snapshots> 39 <enabled>true</enabled> 40 <updatePolicy>always</updatePolicy> 41 </snapshots> 42 <id>raptor-snapshot-repo</id> 43 <name>Iam Local Maven Repo Snapshots</name> 44 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-snapshot</url> 45 <layout>default</layout> 46 </repository> 47 <repository> 48 <releases> 49 <enabled>true</enabled> 50 </releases> 51 <snapshots> 52 <enabled>true</enabled> 53 <updatePolicy>always</updatePolicy> 54 </snapshots> 55 <id>raptor-release-repo</id> 56 <name>Iam Local Maven Repo Releases</name> 57 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-release</url> 58 <layout>default</layout> 59 </repository> 60 </repositories> 61 <!-- done --> 62 63 <scm> 64 <developerConnection>scm:svn:http://iam.cf.ac.uk/repos/RAPTOR/raptor-ica/trunk</developerConnection> 65 <url>http://iam.cf.ac.uk/repos/RAPTOR/raptor-ica</url> 66 </scm> 67 68 <distributionManagement> 69 <repository> 70 <uniqueVersion>true</uniqueVersion> 71 <id>raptor-release</id> 72 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-release</url> 73 </repository> 74 <snapshotRepository> 75 <uniqueVersion>true</uniqueVersion> 76 <id>raptor-snapshot</id> 77 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-snapshot</url> 78 </snapshotRepository> 79 </distributionManagement> 80 81 <properties> 82 <jetty.version>6.1.23</jetty.version> 83 <spring.version>3.0.3.RELEASE</spring.version> 84 </properties> 85 86 87 <dependencies> 88 89 90 <!-- Raptor Specific --> 91 92 <dependency> 93 <groupId>uk.ac.cardiff.raptor</groupId> 94 <artifactId>raptor-client</artifactId> 95 <version>1.0.2-SNAPSHOT</version> 96 </dependency> 97 98 <dependency> 99 <groupId>uk.ac.cardiff.raptor</groupId> 100 <artifactId>raptor-parse</artifactId> 101 <version>1.0.2-SNAPSHOT</version> 102 </dependency> 103 104 105 <!-- SPRING --> 106 <dependency> 107 <groupId>org.springframework</groupId> 108 <artifactId>spring-webmvc</artifactId> 109 <version>${spring.version}</version> 110 </dependency> 111 112 <dependency> 113 <groupId>org.springframework</groupId> 114 <artifactId>spring-web</artifactId> 115 <version>${spring.version}</version> 116 </dependency> 117 118 119 120 <!-- Various Application Context utilities, including EhCache, JavaMail, 121 Quartz, and Freemarker integration Define this if you need any of these integrations --> 122 <dependency> 123 <groupId>org.springframework</groupId> 124 <artifactId>spring-context-support</artifactId> 125 <version>${spring.version}</version> 126 </dependency> 127 128 <dependency> 129 <groupId>org.springframework</groupId> 130 <artifactId>spring-context</artifactId> 131 <version>${spring.version}</version> 132 </dependency> 133 134 <dependency> 135 <groupId>org.springframework</groupId> 136 <artifactId>spring-core</artifactId> 137 <version>${spring.version}</version> 138 </dependency> 139 <!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> 140 <version>${spring.version}</version> </dependency> --> 141 <dependency> 142 <groupId>org.springframework</groupId> 143 <artifactId>spring-beans</artifactId> 144 <version>${spring.version}</version> 145 </dependency> 146 147 <dependency> 148 <groupId>org.springframework</groupId> 149 <artifactId>spring-jdbc</artifactId> 150 <version>${spring.version}</version> 151 </dependency> 152 153 <dependency> 154 <groupId>org.springframework</groupId> 155 <artifactId>spring-tx</artifactId> 156 <version>${spring.version}</version> 157 </dependency> 158 159 <dependency> 160 <groupId>org.springframework</groupId> 161 <artifactId>spring-aop</artifactId> 162 <version>${spring.version}</version> 163 </dependency> 164 165 166 <!-- various --> 167 <dependency> 168 <groupId>junit</groupId> 169 <artifactId>junit</artifactId> 170 <version>4.8.1</version> 171 <scope>test</scope> 172 </dependency> 173 <dependency> 174 <groupId>org.apache.maven.shared</groupId> 175 <artifactId>maven-runtime</artifactId> 176 <version>1.0-alpha-2</version> 177 </dependency> 178 <dependency> 179 <groupId>org.quartz-scheduler</groupId> 180 <artifactId>quartz</artifactId> 181 <version>1.8.0</version> 182 <exclusions> 183 <exclusion> 184 <artifactId>slf4j-api</artifactId> 185 <groupId>org.slf4j</groupId> 186 </exclusion> 187 <exclusion> 188 <artifactId>slf4j-log4j12</artifactId> 189 <groupId>org.slf4j</groupId> 190 </exclusion> 191 </exclusions> 192 </dependency> 193 194 <dependency> 195 <groupId>xerces</groupId> 196 <artifactId>xercesImpl</artifactId> 197 <version>2.9.1</version> 198 </dependency> 199 200 <!-- jetty runtime for standalone deployment --> 201 202 <dependency> 203 <groupId>org.mortbay.jetty</groupId> 204 <artifactId>jetty</artifactId> 205 <version>${jetty.version}</version> 206 </dependency> 207 <dependency> 208 <groupId>org.mortbay.jetty</groupId> 209 <artifactId>start</artifactId> 210 <version>${jetty.version}</version> 211 </dependency> 212 <dependency> 213 <groupId>org.mortbay.jetty</groupId> 214 <artifactId>jetty-util</artifactId> 215 <version>${jetty.version}</version> 216 </dependency> 217 218 <!-- data access objects --> 219 <dependency> 220 <groupId>postgresql</groupId> 221 <artifactId>postgresql</artifactId> 222 <version>9.0-801.jdbc4</version> 223 </dependency> 224 225 <dependency> 226 <groupId>commons-dbcp</groupId> 227 <artifactId>commons-dbcp</artifactId> 228 <version>1.2.2</version> 229 </dependency> 230 231 <dependency> 232 <groupId>commons-lang</groupId> 233 <artifactId>commons-lang</artifactId> 234 <version>2.6</version> 235 </dependency> 236 </dependencies> 237 238 <build> 239 <pluginManagement> 240 <plugins> 241 242 <plugin> 243 <groupId>org.apache.maven.plugins</groupId> 244 <artifactId>maven-compiler-plugin</artifactId> 245 <configuration> 246 <source>1.6</source> 247 <target>1.6</target> 248 </configuration> 249 </plugin> 250 <plugin> 251 <groupId>org.apache.maven.plugins</groupId> 252 <artifactId>maven-eclipse-plugin</artifactId> 253 <configuration> 254 <projectNameTemplate>[artifactId]-[version]</projectNameTemplate> 255 <wtpmanifest>true</wtpmanifest> 256 <wtpapplicationxml>true</wtpapplicationxml> 257 <wtpversion>2.0</wtpversion> 258 </configuration> 259 </plugin> 260 <plugin> 261 <groupId>com.google.code.maven-license-plugin</groupId> 262 <artifactId>maven-license-plugin</artifactId> 263 <version>1.4.0</version> 264 </plugin> 265 </plugins> 266 </pluginManagement> 267 <plugins> 268 <plugin> 269 <artifactId>maven-jar-plugin</artifactId> 270 <configuration> 271 <finalName>raptor-ica</finalName> <!-- removed -${project.version} --> 272 <useUniqueVersions>false</useUniqueVersions> 273 <archive> 274 <index>true</index> 275 <manifest> 276 <mainClass> 277 uk.ac.cardiff.raptorica.server.RunServer</mainClass> 278 <addClasspath>true</addClasspath> 279 <classpathPrefix>lib/</classpathPrefix> 280 <classpathLayoutType>custom</classpathLayoutType> 281 <customClasspathLayout>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</customClasspathLayout> 282 </manifest> 283 </archive> 284 </configuration> 285 <dependencies> 286 <dependency> 287 <groupId>org.apache.maven</groupId> 288 <artifactId>maven-archiver</artifactId> 289 <version>2.4</version> 290 </dependency> 291 </dependencies> 292 </plugin> 293 <plugin> 294 <groupId>org.apache.maven.plugins</groupId> 295 <artifactId>maven-dependency-plugin</artifactId> 296 <executions> 297 <execution> 298 <id>copy-dependencies</id> 299 <phase>package</phase> 300 <goals> 301 <goal>copy-dependencies</goal> 302 </goals> 303 <configuration> 304 <outputDirectory>${project.build.directory}/lib</outputDirectory> 305 <overWriteReleases>false</overWriteReleases> 306 <overWriteSnapshots>false</overWriteSnapshots> 307 <overWriteIfNewer>true</overWriteIfNewer> 308 309 </configuration> 310 </execution> 311 </executions> 312 </plugin> 313 <plugin> 314 <artifactId>maven-assembly-plugin</artifactId> 315 <executions> 316 <execution> 317 <id>assembly</id> 318 <phase>package</phase> 319 <goals> 320 <goal>assembly</goal> 321 </goals> 322 <configuration> 323 <appendAssemblyId>false</appendAssemblyId> 324 <finalName>raptor-ica-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</finalName> 325 <descriptors> 326 <descriptor>src/main/resources/package.xml</descriptor> 327 </descriptors> 328 </configuration> 329 </execution> 330 </executions> 331 </plugin> 332 <plugin> 333 <groupId>org.codehaus.mojo</groupId> 334 <artifactId>appassembler-maven-plugin</artifactId> 335 <version>1.1.1</version> 336 <configuration> 337 <repositoryLayout>flat</repositoryLayout> 338 <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath> 339 <assembleDirectory>${project.build.directory}/news</assembleDirectory> 340 <configurationDirectory>conf</configurationDirectory> 341 <copyConfigurationDirectory>true</copyConfigurationDirectory> 342 <binPrefix>raptor</binPrefix> 343 <daemons> 344 <daemon> 345 <id>ICA</id> 346 <mainClass>uk.ac.cardiff.raptorica.server.RunServer</mainClass> 347 <commandLineArguments> 348 <commandLineArgument>start</commandLineArgument> 349 </commandLineArguments> 350 <platforms> 351 <platform>jsw</platform> 352 </platforms> 353 </daemon> 354 </daemons> 355 </configuration> 356 <executions> 357 <execution> 358 <id>generate-jsw-scripts</id> 359 <phase>package</phase> 360 <goals> 361 <goal>generate-daemons</goal> 362 </goals> 363 </execution> 364 </executions> 365 </plugin> 366 367 <plugin> 368 <groupId>org.codehaus.mojo</groupId> 369 <artifactId>build-helper-maven-plugin</artifactId> 370 <version>1.5</version> 371 <executions> 372 <execution> 373 <id>parse-version</id> 374 <goals> 375 <goal>parse-version</goal> 376 </goals> 377 </execution> 378 </executions> 379 </plugin> 380 <plugin> 381 <artifactId>maven-release-plugin</artifactId> 382 <version>2.0</version> 383 <configuration> 384 <tagBase> 385 http://iam.cf.ac.uk/repos/RAPTOR/raptor-ica/tags 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 3 <modelVersion>4.0.0</modelVersion> 4 <groupId>uk.ac.cardiff.raptor</groupId> 5 <artifactId>raptor-ica</artifactId> 6 <version>1.0.2-SNAPSHOT</version> 7 <name>Raptor Information Collector Agent</name> 8 <description> </description> 9 10 11 12 <licenses> 13 <license> 14 <name>Apache 2</name> 15 <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> 16 <distribution>repo</distribution> 17 </license> 18 </licenses> 19 20 <!-- Adding extra repositories for any other libs, which is hosted on Iam --> 21 <repositories> 22 <repository> 23 <releases> 24 <enabled>true</enabled> 25 </releases> 26 <snapshots> 27 <enabled>true</enabled> 28 <updatePolicy>always</updatePolicy> 29 </snapshots> 30 <id>raptor-extras-repo</id> 31 <name>Iam Local Maven Repo</name> 32 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-extra</url> 33 <layout>default</layout> 34 </repository> 35 <repository> 36 <releases> 37 <enabled>true</enabled> 38 </releases> 39 <snapshots> 40 <enabled>true</enabled> 41 <updatePolicy>always</updatePolicy> 42 </snapshots> 43 <id>raptor-snapshot-repo</id> 44 <name>Iam Local Maven Repo Snapshots</name> 45 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-snapshot</url> 46 <layout>default</layout> 47 </repository> 48 <repository> 49 <releases> 50 <enabled>true</enabled> 51 </releases> 52 <snapshots> 53 <enabled>true</enabled> 54 <updatePolicy>always</updatePolicy> 55 </snapshots> 56 <id>raptor-release-repo</id> 57 <name>Iam Local Maven Repo Releases</name> 58 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-release</url> 59 <layout>default</layout> 60 </repository> 61 </repositories> 62 <!-- done --> 63 64 <scm> 65 <developerConnection>scm:svn:http://iam.cf.ac.uk/repos/RAPTOR/raptor-ica/trunk</developerConnection> 66 <url>http://iam.cf.ac.uk/repos/RAPTOR/raptor-ica</url> 67 </scm> 68 69 <distributionManagement> 70 <repository> 71 <uniqueVersion>true</uniqueVersion> 72 <id>raptor-release</id> 73 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-release</url> 74 </repository> 75 <snapshotRepository> 76 <uniqueVersion>true</uniqueVersion> 77 <id>raptor-snapshot</id> 78 <url>http://iam.cf.ac.uk/nexus-webapp-1.6.0/content/repositories/raptor-snapshot</url> 79 </snapshotRepository> 80 </distributionManagement> 81 82 <properties> 83 <jetty.version>6.1.23</jetty.version> 84 <spring.version>3.0.3.RELEASE</spring.version> 85 </properties> 86 87 88 <dependencies> 89 90 91 <!-- Raptor Specific --> 92 93 <dependency> 94 <groupId>uk.ac.cardiff.raptor</groupId> 95 <artifactId>raptor-client</artifactId> 96 <version>1.0.2-SNAPSHOT</version> 97 </dependency> 98 99 <dependency> 100 <groupId>uk.ac.cardiff.raptor</groupId> 101 <artifactId>raptor-parse</artifactId> 102 <version>1.0.2-SNAPSHOT</version> 103 </dependency> 104 105 106 <!-- SPRING --> 107 <dependency> 108 <groupId>org.springframework</groupId> 109 <artifactId>spring-webmvc</artifactId> 110 <version>${spring.version}</version> 111 </dependency> 112 113 <dependency> 114 <groupId>org.springframework</groupId> 115 <artifactId>spring-web</artifactId> 116 <version>${spring.version}</version> 117 </dependency> 118 119 120 121 <!-- Various Application Context utilities, including EhCache, JavaMail, Quartz, and Freemarker integration Define 122 this if you need any of these integrations --> 123 <dependency> 124 <groupId>org.springframework</groupId> 125 <artifactId>spring-context-support</artifactId> 126 <version>${spring.version}</version> 127 </dependency> 128 129 <dependency> 130 <groupId>org.springframework</groupId> 131 <artifactId>spring-context</artifactId> 132 <version>${spring.version}</version> 133 </dependency> 134 135 <dependency> 136 <groupId>org.springframework</groupId> 137 <artifactId>spring-core</artifactId> 138 <version>${spring.version}</version> 139 </dependency> 140 <!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> <version>${spring.version}</version> 141 </dependency> --> 142 <dependency> 143 <groupId>org.springframework</groupId> 144 <artifactId>spring-beans</artifactId> 145 <version>${spring.version}</version> 146 </dependency> 147 148 <dependency> 149 <groupId>org.springframework</groupId> 150 <artifactId>spring-jdbc</artifactId> 151 <version>${spring.version}</version> 152 </dependency> 153 154 <dependency> 155 <groupId>org.springframework</groupId> 156 <artifactId>spring-tx</artifactId> 157 <version>${spring.version}</version> 158 </dependency> 159 160 <dependency> 161 <groupId>org.springframework</groupId> 162 <artifactId>spring-aop</artifactId> 163 <version>${spring.version}</version> 164 </dependency> 165 166 167 <!-- various --> 168 <dependency> 169 <groupId>junit</groupId> 170 <artifactId>junit</artifactId> 171 <version>4.8.1</version> 172 <scope>test</scope> 173 </dependency> 174 <dependency> 175 <groupId>org.apache.maven.shared</groupId> 176 <artifactId>maven-runtime</artifactId> 177 <version>1.0-alpha-2</version> 178 </dependency> 179 <dependency> 180 <groupId>org.quartz-scheduler</groupId> 181 <artifactId>quartz</artifactId> 182 <version>1.8.0</version> 183 <exclusions> 184 <exclusion> 185 <artifactId>slf4j-api</artifactId> 186 <groupId>org.slf4j</groupId> 187 </exclusion> 188 <exclusion> 189 <artifactId>slf4j-log4j12</artifactId> 190 <groupId>org.slf4j</groupId> 191 </exclusion> 192 </exclusions> 193 </dependency> 194 195 <dependency> 196 <groupId>xerces</groupId> 197 <artifactId>xercesImpl</artifactId> 198 <version>2.9.1</version> 199 </dependency> 200 201 <!-- jetty runtime for standalone deployment --> 202 203 <dependency> 204 <groupId>org.mortbay.jetty</groupId> 205 <artifactId>jetty</artifactId> 206 <version>${jetty.version}</version> 207 </dependency> 208 <dependency> 209 <groupId>org.mortbay.jetty</groupId> 210 <artifactId>start</artifactId> 211 <version>${jetty.version}</version> 212 </dependency> 213 <dependency> 214 <groupId>org.mortbay.jetty</groupId> 215 <artifactId>jetty-util</artifactId> 216 <version>${jetty.version}</version> 217 </dependency> 218 <dependency> 219 <groupId>jetty</groupId> 220 <artifactId>jetty-management</artifactId> 221 <version>6.0.1</version> 222 </dependency> 223 224 225 <!-- data access objects --> 226 <dependency> 227 <groupId>postgresql</groupId> 228 <artifactId>postgresql</artifactId> 229 <version>9.0-801.jdbc4</version> 230 </dependency> 231 232 <dependency> 233 <groupId>commons-dbcp</groupId> 234 <artifactId>commons-dbcp</artifactId> 235 <version>1.2.2</version> 236 </dependency> 237 238 <dependency> 239 <groupId>commons-lang</groupId> 240 <artifactId>commons-lang</artifactId> 241 <version>2.6</version> 242 </dependency> 243 244 245 </dependencies> 246 247 <build> 248 <pluginManagement> 249 <plugins> 250 251 <plugin> 252 <groupId>org.apache.maven.plugins</groupId> 253 <artifactId>maven-compiler-plugin</artifactId> 254 <configuration> 255 <source>1.6</source> 256 <target>1.6</target> 257 </configuration> 258 </plugin> 259 <plugin> 260 <groupId>org.apache.maven.plugins</groupId> 261 <artifactId>maven-eclipse-plugin</artifactId> 262 <configuration> 263 <projectNameTemplate>[artifactId]-[version]</projectNameTemplate> 264 <wtpmanifest>true</wtpmanifest> 265 <wtpapplicationxml>true</wtpapplicationxml> 266 <wtpversion>2.0</wtpversion> 267 </configuration> 268 </plugin> 269 <plugin> 270 <groupId>com.google.code.maven-license-plugin</groupId> 271 <artifactId>maven-license-plugin</artifactId> 272 <version>1.4.0</version> 273 </plugin> 274 </plugins> 275 </pluginManagement> 276 <plugins> 277 <plugin> 278 <artifactId>maven-jar-plugin</artifactId> 279 <configuration> 280 <finalName>raptor-ica</finalName> <!-- removed -${project.version} --> 281 <useUniqueVersions>false</useUniqueVersions> 282 <archive> 283 <index>true</index> 284 <manifest> 285 <mainClass> 286 uk.ac.cardiff.raptorica.server.RunServer</mainClass> 287 <addClasspath>true</addClasspath> 288 <classpathPrefix>lib/</classpathPrefix> 289 <classpathLayoutType>custom</classpathLayoutType> 290 <customClasspathLayout>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</customClasspathLayout> 291 </manifest> 292 </archive> 293 </configuration> 294 <dependencies> 295 <dependency> 296 <groupId>org.apache.maven</groupId> 297 <artifactId>maven-archiver</artifactId> 298 <version>2.4</version> 299 </dependency> 300 </dependencies> 301 </plugin> 302 <plugin> 303 <groupId>org.apache.maven.plugins</groupId> 304 <artifactId>maven-dependency-plugin</artifactId> 305 <executions> 306 <execution> 307 <id>copy-dependencies</id> 308 <phase>package</phase> 309 <goals> 310 <goal>copy-dependencies</goal> 311 </goals> 312 <configuration> 313 <outputDirectory>${project.build.directory}/lib</outputDirectory> 314 <overWriteReleases>false</overWriteReleases> 315 <overWriteSnapshots>false</overWriteSnapshots> 316 <overWriteIfNewer>true</overWriteIfNewer> 317 318 </configuration> 319 </execution> 320 </executions> 321 </plugin> 322 <plugin> 323 <artifactId>maven-assembly-plugin</artifactId> 324 <executions> 325 <execution> 326 <id>assembly</id> 327 <phase>package</phase> 328 <goals> 329 <goal>assembly</goal> 330 </goals> 331 <configuration> 332 <appendAssemblyId>false</appendAssemblyId> 333 <finalName>raptor-ica-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</finalName> 334 <descriptors> 335 <descriptor>src/main/resources/package.xml</descriptor> 336 </descriptors> 337 </configuration> 338 </execution> 339 </executions> 340 </plugin> 341 <plugin> 342 <groupId>org.codehaus.mojo</groupId> 343 <artifactId>appassembler-maven-plugin</artifactId> 344 <version>1.1.1</version> 345 <configuration> 346 <repositoryLayout>flat</repositoryLayout> 347 <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath> 348 <assembleDirectory>${project.build.directory}/news</assembleDirectory> 349 <configurationDirectory>conf</configurationDirectory> 350 <copyConfigurationDirectory>true</copyConfigurationDirectory> 351 <binPrefix>raptor</binPrefix> 352 <daemons> 353 <daemon> 354 <id>ICA</id> 355 <mainClass>uk.ac.cardiff.raptorica.server.RunServer</mainClass> 356 <commandLineArguments> 357 <commandLineArgument>start</commandLineArgument> 358 </commandLineArguments> 359 <platforms> 360 <platform>jsw</platform> 361 </platforms> 362 </daemon> 363 </daemons> 364 </configuration> 365 <executions> 366 <execution> 367 <id>generate-jsw-scripts</id> 368 <phase>package</phase> 369 <goals> 370 <goal>generate-daemons</goal> 371 </goals> 372 </execution> 373 </executions> 374 </plugin> 375 376 <plugin> 377 <groupId>org.codehaus.mojo</groupId> 378 <artifactId>build-helper-maven-plugin</artifactId> 379 <version>1.5</version> 380 <executions> 381 <execution> 382 <id>parse-version</id> 383 <goals> 384 <goal>parse-version</goal> 385 </goals> 386 </execution> 387 </executions> 388 </plugin> 389 <plugin> 390 <artifactId>maven-release-plugin</artifactId> 391 <version>2.0</version> 392 <configuration> 393 <tagBase> 394 http://iam.cf.ac.uk/repos/RAPTOR/raptor-ica/tags 386 395 </tagBase> 387 <providerImplementations> 388 <svn>javasvn</svn> 389 </providerImplementations> 390 </configuration> 391 <dependencies> 392 <dependency> 393 <groupId>com.google.code.maven-scm-provider-svnjava</groupId> 394 <artifactId>maven-scm-provider-svnjava</artifactId> 395 <version>1.10</version> 396 </dependency> 397 </dependencies> 398 </plugin> 399 <plugin> 400 <groupId>com.google.code.maven-license-plugin</groupId> 401 <artifactId>maven-license-plugin</artifactId> 402 <version>1.4.0</version> 403 <configuration> 404 <includes> 405 <include>src/**</include> 406 <include>**/test/**</include> 407 </includes> 408 <excludes> 409 <exclude>target/**</exclude> 410 <exclude>.clover/**</exclude> 411 </excludes> 412 <header>src/main/resources/license-apache</header> 413 <properties> 414 <year>2010</year> 415 <email>smartp@cf.ac.uk</email> 416 <name>Cardiff University, Wales</name> 417 </properties> 418 </configuration> 419 <executions> 420 <execution> 421 <goals> 422 <goal>check</goal> 423 </goals> 424 </execution> 425 </executions> 426 </plugin> 427 428 <!-- PLUGIN to COPY correct directories into the target directory for 429 packaging --> 430 <plugin> 431 <artifactId>maven-resources-plugin</artifactId> 432 <version>2.5</version> 433 <executions> 434 <execution> 435 <id>copy-resources-conf-default</id> 436 <!-- here the phase you need --> 437 <phase>prepare-package</phase> 438 <goals> 439 <goal>copy-resources</goal> 440 </goals> 441 <configuration> 442 <outputDirectory>${basedir}/target/conf-default</outputDirectory> 443 <resources> 444 <resource> 445 <directory>src/main/conf-default</directory> 446 <filtering>true</filtering> 447 </resource> 448 </resources> 449 </configuration> 450 </execution> 451 <execution> 452 <id>copy-resources-bin</id> 453 <!-- here the phase you need --> 454 <phase>prepare-package</phase> 455 <goals> 456 <goal>copy-resources</goal> 457 </goals> 458 <configuration> 459 <outputDirectory>${basedir}/target/bin</outputDirectory> 460 <resources> 461 <resource> 462 <directory>src/main/bin</directory> 463 <filtering>true</filtering> 464 </resource> 465 </resources> 466 </configuration> 467 </execution> 468 <execution> 469 <id>copy-resources-keys</id> 470 <!-- here the phase you need --> 471 <phase>prepare-package</phase> 472 <goals> 473 <goal>copy-resources</goal> 474 </goals> 475 <configuration> 476 <outputDirectory>${basedir}/target/keys</outputDirectory> 477 <resources> 478 <resource> 479 <directory>src/main/keys</directory> 480 <filtering>true</filtering> 481 </resource> 482 </resources> 483 </configuration> 484 </execution> 485 <execution> 486 <id>copy-resources-conf</id> 487 <!-- here the phase you need --> 488 <phase>prepare-package</phase> 489 <goals> 490 <goal>copy-resources</goal> 491 </goals> 492 <configuration> 493 <outputDirectory>${basedir}/target/conf</outputDirectory> 494 <resources> 495 <resource> 496 <directory>src/main/config</directory> 497 <filtering>true</filtering> 498 </resource> 499 </resources> 500 </configuration> 501 </execution> 502 </executions> 503 </plugin> 504 505 506 <!-- PLUGIN to COPY correct directories into the target directory for 507 packaging...DONE --> 508 509 </plugins> 510 511 </build> 396 <providerImplementations> 397 <svn>javasvn</svn> 398 </providerImplementations> 399 </configuration> 400 <dependencies> 401 <dependency> 402 <groupId>com.google.code.maven-scm-provider-svnjava</groupId> 403 <artifactId>maven-scm-provider-svnjava</artifactId> 404 <version>1.10</version> 405 </dependency> 406 </dependencies> 407 </plugin> 408 <plugin> 409 <groupId>com.google.code.maven-license-plugin</groupId> 410 <artifactId>maven-license-plugin</artifactId> 411 <version>1.4.0</version> 412 <configuration> 413 <includes> 414 <include>src/**</include> 415 <include>**/test/**</include> 416 </includes> 417 <excludes> 418 <exclude>target/**</exclude> 419 <exclude>.clover/**</exclude> 420 </excludes> 421 <header>src/main/resources/license-apache</header> 422 <properties> 423 <year>2010</year> 424 <email>smartp@cf.ac.uk</email> 425 <name>Cardiff University, Wales</name> 426 </properties> 427 </configuration> 428 <executions> 429 <execution> 430 <goals> 431 <goal>check</goal> 432 </goals> 433 </execution> 434 </executions> 435 </plugin> 436 437 <!-- PLUGIN to COPY correct directories into the target directory for packaging --> 438 <plugin> 439 <artifactId>maven-resources-plugin</artifactId> 440 <version>2.5</version> 441 <executions> 442 <execution> 443 <id>copy-resources-conf-default</id> 444 <!-- here the phase you need --> 445 <phase>prepare-package</phase> 446 <goals> 447 <goal>copy-resources</goal> 448 </goals> 449 <configuration> 450 <outputDirectory>${basedir}/target/conf-default</outputDirectory> 451 <resources> 452 <resource> 453 <directory>src/main/conf-default</directory> 454 <filtering>true</filtering> 455 </resource> 456 </resources> 457 </configuration> 458 </execution> 459 <execution> 460 <id>copy-resources-bin</id> 461 <!-- here the phase you need --> 462 <phase>prepare-package</phase> 463 <goals> 464 <goal>copy-resources</goal> 465 </goals> 466 <configuration> 467 <outputDirectory>${basedir}/target/bin</outputDirectory> 468 <resources> 469 <resource> 470 <directory>src/main/bin</directory> 471 <filtering>true</filtering> 472 </resource> 473 </resources> 474 </configuration> 475 </execution> 476 <execution> 477 <id>copy-resources-keys</id> 478 <!-- here the phase you need --> 479 <phase>prepare-package</phase> 480 <goals> 481 <goal>copy-resources</goal> 482 </goals> 483 <configuration> 484 <outputDirectory>${basedir}/target/keys</outputDirectory> 485 <resources> 486 <resource> 487 <directory>src/main/keys</directory> 488 <filtering>true</filtering> 489 </resource> 490 </resources> 491 </configuration> 492 </execution> 493 <execution> 494 <id>copy-resources-conf</id> 495 <!-- here the phase you need --> 496 <phase>prepare-package</phase> 497 <goals> 498 <goal>copy-resources</goal> 499 </goals> 500 <configuration> 501 <outputDirectory>${basedir}/target/conf</outputDirectory> 502 <resources> 503 <resource> 504 <directory>src/main/config</directory> 505 <filtering>true</filtering> 506 </resource> 507 </resources> 508 </configuration> 509 </execution> 510 </executions> 511 </plugin> 512 513 514 <!-- PLUGIN to COPY correct directories into the target directory for packaging...DONE --> 515 516 </plugins> 517 518 </build> 512 519 </project> -
raptor-ica/trunk/src/main/config/event-parse-formats-custom.xml
r1219 r1354 24 24 <!-- THIS IS EMPTY, BUT YOU COULD ADD YOUR OWN EVENT FORMATS HERE --> 25 25 26 26 <bean id="ezProxyFileFormatMathew" class="uk.ac.cardiff.raptor.parse.external.file.format.LogFileFormat"> 27 <property name="headers"> 28 <list> 29 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 30 <property name="fieldName"> 31 <value>requesterIp</value> 32 </property> 33 <property name="fieldNo"> 34 <value>0</value> 35 </property> 36 <property name="fieldType"> 37 <value>STRING</value> 38 </property> 39 </bean> 40 41 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 42 <property name="fieldName"> 43 <value>principalName</value> 44 </property> 45 <property name="fieldNo"> 46 <value>2</value> 47 </property> 48 <property name="fieldType"> 49 <value>STRING</value> 50 </property> 51 <property name="regexReplaceAll"> 52 <map> 53 <entry key="@cardiff.ac.uk" value=""/> 54 </map> 55 </property> 56 </bean> 57 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 58 <property name="fieldName"> 59 <value>eventTime</value> 60 </property> 61 <property name="fieldNo"> 62 <value>3</value> 63 </property> 64 <property name="additionalFieldNos"> 65 <list> 66 <value>4</value> 67 </list> 68 </property> 69 <property name="fieldType"> 70 <value>DATE</value> 71 </property> 72 <property name="timeZone"> 73 <value>UTC</value> 74 </property> 75 <property name="dateTimeFormat"> 76 <value>dd/MMM/yyyy:HH:mm:ssZ</value> 77 </property> 78 <property name="regexReplaceAll"> 79 <map> 80 <entry key="\[" value=""/> 81 <entry key="\]" value=""/> 82 </map> 83 </property> 84 </bean> 85 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 86 <property name="fieldName"> 87 <value>serviceHost</value> 88 </property> 89 <property name="fieldNo"> 90 <value>6</value> 91 </property> 92 <property name="fieldType"> 93 <value>STRING</value> 94 </property> 95 <property name="regexRetain"> 96 <value>https://[^:]*|http://[^:]*</value> 97 </property> 98 </bean> 99 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 100 <property name="fieldName"> 101 <value>resourceId</value> 102 </property> 103 <property name="fieldNo"> 104 <value>6</value> 105 </property> 106 <property name="fieldType"> 107 <value>URL</value> 108 </property> 109 <property name="regexRetain"> 110 <value>url=http%3a%2f%2f[^%]*|url=https://[^/]*|url=https%3a%2f%2f[^%]*|url=http://[^/]*|url=%2520http%3a%2f%2f[^%]*|url=%2520https%3a%2f%2f[^%]*|url=%20http%3a%2f%2f[^%]*|url=%20https%3a%2f%2f[^%]*|url=http%253A%252F%252F[^%]*</value> 111 </property> 112 <property name="regexRetainCaseInsensitive"> 113 <value>true</value> 114 </property> 115 <property name="regexReplaceAll"> 116 <map> 117 <entry key="url=" value=""/> 118 <entry key="%2520" value=""/> 119 </map> 120 </property> 121 </bean> 122 </list> 123 </property> 124 <property name="delimeter"> 125 <value> </value> 126 </property> 127 </bean> 27 128 28 129 -
raptor-ica/trunk/src/main/config/event-parse.xml
r1219 r1354 56 56 57 57 <bean id="ezproxyLFP" class="uk.ac.cardiff.raptor.parse.external.file.LogFileParser"> 58 <property name="enabled" value=" false"/>58 <property name="enabled" value="true"/> 59 59 <property name="eventHandler"><ref bean="memoryEventHandler"></ref></property> 60 60 <property name="logfile"> 61 <value>file:///Users/philsmart/Documents/DataSets/Logs/ezproxy- 20110107.log61 <value>file:///Users/philsmart/Documents/DataSets/Logs/ezproxy-mathew.log 62 62 </value> 63 63 </property> 64 64 <property name="format"> 65 <ref bean="ezProxyFileFormat " />65 <ref bean="ezProxyFileFormatMathew" /> 66 66 </property> 67 67 <property name="eventType"> … … 72 72 <property name="includeLineFilters"> 73 73 <list> 74 <bean class="uk.ac.cardiff.raptor.parse.filter. ContainsLineFilter">75 <property name="includeIfContains"><value> connect?session</value></property>74 <bean class="uk.ac.cardiff.raptor.parse.filter.RegexContainsLineFilter"> 75 <property name="includeIfContains"><value>GET[\p{Z}\s][^\p{Z}\s]*connect\?session</value></property> 76 76 </bean> 77 77 </list> … … 94 94 95 95 <bean id="shibbolethAuditLFP" class="uk.ac.cardiff.raptor.parse.external.file.LogFileParser"> 96 <property name="enabled" value=" true"/>96 <property name="enabled" value="false"/> 97 97 <property name="eventHandler"><ref bean="memoryEventHandler"></ref></property> 98 98 <property name="logfile"> -
raptor-ica/trunk/src/main/config/logging.xml
r1189 r1354 47 47 </logger> 48 48 49 <logger name="uk.ac.cardiff" level=" debug">49 <logger name="uk.ac.cardiff" level="trace"> 50 50 <appender-ref ref="stdout"/> 51 51 <appender-ref ref="FILE"/>
Note: See TracChangeset
for help on using the changeset viewer.
