Skip to content

Commit 3f61e1c

Browse files
author
Vladimir Kotal
committed
Merge branch 'Orviss-mavenize'
2 parents ca20911 + 6d5300a commit 3f61e1c

File tree

1,004 files changed

+3889
-9198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,004 files changed

+3889
-9198
lines changed

‎.classpath

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.project

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎build.xml

Lines changed: 0 additions & 1277 deletions
This file was deleted.

‎codestyle-jel.eclipse.xml

Lines changed: 0 additions & 279 deletions
This file was deleted.

‎distribution/pom.xml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.opensolaris.opengrok</groupId>
8+
<groupId>org.opengrok</groupId>
99
<artifactId>opengrok-top</artifactId>
1010
<version>1.1-rc35</version>
1111
</parent>
@@ -22,13 +22,13 @@
2222
-->
2323
<dependencies>
2424
<dependency>
25-
<groupId>org.opensolaris.opengrok</groupId>
25+
<groupId>org.opengrok</groupId>
2626
<artifactId>opengrok</artifactId>
2727
<version>1.1-rc35</version>
2828
</dependency>
2929

3030
<dependency>
31-
<groupId>org.opensolaris.opengrok</groupId>
31+
<groupId>org.opengrok</groupId>
3232
<artifactId>opengrok-web</artifactId>
3333
<version>1.1-rc35</version>
3434
<type>war</type>
@@ -37,30 +37,6 @@
3737

3838
<build>
3939
<plugins>
40-
<plugin>
41-
<groupId>org.codehaus.mojo</groupId>
42-
<artifactId>exec-maven-plugin</artifactId>
43-
<version>1.6.0</version>
44-
<executions>
45-
<execution>
46-
<id>man-page</id>
47-
<phase>package</phase>
48-
<goals>
49-
<goal>exec</goal>
50-
</goals>
51-
</execution>
52-
</executions>
53-
<configuration>
54-
<executable>java</executable>
55-
<outputFile>${project.build.directory}/dist/opengrok.1</outputFile>
56-
<arguments>
57-
<argument>-classpath</argument>
58-
<argument>${project.basedir}/../opengrok-indexer/target/opengrok-${project.version}.jar</argument>
59-
<argument>org.opensolaris.opengrok.index.Indexer</argument>
60-
<argument>--man</argument>
61-
</arguments>
62-
</configuration>
63-
</plugin>
6440
<plugin>
6541
<groupId>org.apache.maven.plugins</groupId>
6642
<artifactId>maven-dependency-plugin</artifactId>
@@ -81,6 +57,30 @@
8157
</execution>
8258
</executions>
8359
</plugin>
60+
<plugin>
61+
<groupId>org.codehaus.mojo</groupId>
62+
<artifactId>exec-maven-plugin</artifactId>
63+
<version>1.6.0</version>
64+
<executions>
65+
<execution>
66+
<id>man-page</id>
67+
<phase>package</phase>
68+
<goals>
69+
<goal>exec</goal>
70+
</goals>
71+
</execution>
72+
</executions>
73+
<configuration>
74+
<executable>java</executable>
75+
<outputFile>${project.build.directory}/dist/opengrok.1</outputFile>
76+
<arguments>
77+
<argument>-classpath</argument>
78+
<argument>${project.build.directory}/dist/opengrok-${project.version}.jar</argument>
79+
<argument>org.opengrok.indexer.index.Indexer</argument>
80+
<argument>--man</argument>
81+
</arguments>
82+
</configuration>
83+
</plugin>
8484
<plugin>
8585
<artifactId>maven-assembly-plugin</artifactId>
8686
<version>3.1.0</version>

‎ext/SampleRazorRepository/README-Usage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Setting up the sample Razor repository
44
Razor is a centralised Source Code Management and Issue Tracking
55
System, whose basics are described in more detail in
66
RazorRepository.java (which can be found in
7-
opengrok/src/org/opensolaris/opengrok/history directory).
7+
opengrok/src/main/java/org/opengrok/history directory).
88

99
A normal OpenGrok user would extract a read-only checkout of the files
1010
and directories from Razor they wished OpenGrok to process using

‎jrcs/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<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/maven-v4_0_0.xsd">
43
<modelVersion>4.0.0</modelVersion>
5-
<groupId>org.opensolaris.opengrok</groupId>
6-
<artifactId>jrcs</artifactId>
7-
<packaging>jar</packaging>
8-
<version>1.1-rc35</version>
9-
<name>Java RCS</name>
104

115
<parent>
12-
<groupId>org.opensolaris.opengrok</groupId>
6+
<groupId>org.opengrok</groupId>
137
<artifactId>opengrok-top</artifactId>
148
<version>1.1-rc35</version>
159
</parent>
1610

11+
<artifactId>jrcs</artifactId>
12+
<packaging>jar</packaging>
13+
<version>1.1-rc35</version>
14+
15+
<name>Java RCS</name>
16+
1717
<dependencies>
1818
<dependency>
1919
<groupId>junit</groupId>

‎lib/json-simple-1.1.1.jar

-23.2 KB
Binary file not shown.

‎nbproject/licenseheader.txt renamed to ‎licenseheader.txt

File renamed without changes.

‎logging.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ java.util.logging.FileHandler.limit = 52428800
4444
java.util.logging.FileHandler.count = 3
4545
java.util.logging.FileHandler.level = ALL
4646
#java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
47-
java.util.logging.FileHandler.formatter = org.opensolaris.opengrok.logger.formatter.SimpleFileLogFormatter
47+
java.util.logging.FileHandler.formatter = org.opengrok.indexer.logger.formatter.SimpleFileLogFormatter
4848

4949
# Limit the message that are printed on the console to WARNING and above (default "quiet" mode).
5050
# if verbose is set, then log INFO and above
5151
java.util.logging.ConsoleHandler.level = WARNING
52-
java.util.logging.ConsoleHandler.formatter = org.opensolaris.opengrok.logger.formatter.SimpleConsoleFormatter
52+
java.util.logging.ConsoleHandler.formatter = org.opengrok.indexer.logger.formatter.SimpleConsoleFormatter
5353

5454

5555
############################################################
@@ -60,4 +60,4 @@ java.util.logging.ConsoleHandler.formatter = org.opensolaris.opengrok.logger.for
6060
# For example, set the com.xyz.foo logger to only log SEVERE
6161
# messages:
6262
#com.xyz.foo.level = SEVERE
63-
org.opensolaris.opengrok.level = ALL
63+
org.opengrok.level = ALL

0 commit comments

Comments
 (0)