Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
b5c7d15f
Commit
b5c7d15f
authored
Jun 09, 2014
by
Sven Bunge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove activation.jar - It's bundled since Java6
parent
8e178247
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
build.xml
build/build.xml
+4
-4
classpath
build/eclipse/classpath
+0
-1
activation.jar
build/lib/dist/activation.jar
+0
-0
openfire-dev.bat
src/bin/openfire-dev.bat
+2
-2
No files found.
build/build.xml
View file @
b5c7d15f
...
...
@@ -133,7 +133,7 @@
<fileset
dir=
"${lib.build.dir}"
includes=
"*.jar"
excludes=
"junit.jar"
/>
<fileset
dir=
"${lib.merge.dir}"
includes=
"*.jar"
/>
<fileset
dir=
"${lib.dist.dir}"
includes=
"servlet-api.jar, mail.jar,
activation.jar,
jdic.jar, bcpg-jdk15on.jar bcpkix-jdk15on.jar bcprov-jdk15on.jar"
/>
includes=
"servlet-api.jar, mail.jar, jdic.jar, bcpg-jdk15on.jar bcpkix-jdk15on.jar bcprov-jdk15on.jar"
/>
</path>
<path
id=
"compile.dependencies"
>
...
...
@@ -908,7 +908,7 @@
<for
param=
"jar"
>
<path>
<fileset
dir=
"${release.out.dir}/lib"
includes=
"*.jar"
excludes=
"startup.jar,jdic.jar,mail.jar,
activation.jar,
bcpg-jdk15on.jar,bcpkix-jdk15on.jar,bcprov-jdk15on.jar"
/>
excludes=
"startup.jar,jdic.jar,mail.jar,bcpg-jdk15on.jar,bcpkix-jdk15on.jar,bcprov-jdk15on.jar"
/>
</path>
<sequential>
<delete
file=
"@{jar}.pack"
/>
...
...
@@ -925,7 +925,7 @@
<for
param=
"jar"
>
<path>
<fileset
dir=
"${release.out.dir}/plugins/admin/webapp/WEB-INF/lib"
includes=
"*.jar"
excludes=
"startup.jar,jdic.jar,mail.jar,
activation.jar,
bcpg-jdk15on.jar,bcpkix-jdk15on.jar,bcprov-jdk15on.jar"
/>
excludes=
"startup.jar,jdic.jar,mail.jar,bcpg-jdk15on.jar,bcpkix-jdk15on.jar,bcprov-jdk15on.jar"
/>
</path>
<sequential>
<delete
file=
"@{jar}.pack"
/>
...
...
@@ -1553,7 +1553,7 @@
be manually added to this list.
-->
<property
name=
"pack200.excludes"
value=
"gnujaxp.jar,mail.jar,
activation.jar,
bcpg-jdk15on.jar,bcpkix-jdk15on.jar,bcprov-jdk15on.jar,tangosol.jar"
/>
value=
"gnujaxp.jar,mail.jar,bcpg-jdk15on.jar,bcpkix-jdk15on.jar,bcprov-jdk15on.jar,tangosol.jar"
/>
<if>
<equals
arg1=
"${pack200.enabled}"
arg2=
"true"
/>
...
...
build/eclipse/classpath
View file @
b5c7d15f
...
...
@@ -31,7 +31,6 @@
<classpathentry
kind=
"lib"
path=
"build/lib/ant/ant-jive-edition.jar"
/>
<classpathentry
kind=
"lib"
path=
"build/lib/cglib-nodep.jar"
/>
<classpathentry
kind=
"lib"
path=
"build/lib/commons-el.jar"
/>
<classpathentry
kind=
"lib"
path=
"build/lib/dist/activation.jar"
/>
<classpathentry
kind=
"lib"
path=
"build/lib/dist/hsqldb.jar"
/>
<classpathentry
kind=
"lib"
path=
"build/lib/dist/jdic.jar"
/>
<classpathentry
kind=
"lib"
path=
"build/lib/dist/jtds.jar"
/>
...
...
build/lib/dist/activation.jar
deleted
100644 → 0
View file @
8e178247
File deleted
src/bin/openfire-dev.bat
View file @
b5c7d15f
...
...
@@ -33,11 +33,11 @@ goto end
:run
if "%1" == "-debug" goto debug
start "Openfire" "%JAVA_HOME%\bin\java" -DopenfireHome="%OPENFIRE_HOME%" -DdevelopmentMode="true" -server -cp "%JAVA_HOME%\lib\tools.jar;..\..\..\build\lib\ant.jar;..\..\..\build\lib\ant-contrib.jar;..\lib\slf4j-log4j12.jar;..\lib\
activation.jar;..\lib\
bouncycastle.jar;..\lib\commons-el.jar;..\lib\hsqldb.jar;..\lib\jasper-compiler.jar;..\lib\jasper-runtime.jar;..\lib\jtds.jar;..\lib\mail.jar;..\lib\mysql.jar;..\lib\postgres.jar;..\lib\servlet.jar;..\lib\startup.jar;..\lib\openfire.jar" org.jivesoftware.openfire.starter.ServerStarter
start "Openfire" "%JAVA_HOME%\bin\java" -DopenfireHome="%OPENFIRE_HOME%" -DdevelopmentMode="true" -server -cp "%JAVA_HOME%\lib\tools.jar;..\..\..\build\lib\ant.jar;..\..\..\build\lib\ant-contrib.jar;..\lib\slf4j-log4j12.jar;..\lib\bouncycastle.jar;..\lib\commons-el.jar;..\lib\hsqldb.jar;..\lib\jasper-compiler.jar;..\lib\jasper-runtime.jar;..\lib\jtds.jar;..\lib\mail.jar;..\lib\mysql.jar;..\lib\postgres.jar;..\lib\servlet.jar;..\lib\startup.jar;..\lib\openfire.jar" org.jivesoftware.openfire.starter.ServerStarter
goto end
:debug
start "Openfire" "%JAVA_HOME%\bin\java" -DopenfireHome="%OPENFIRE_HOME%" -Xdebug -Xint -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -DdevelopmentMode="true" -D%PLUGIN_WEBROOT% -D%PLUGIN_CLASSES% -server -cp "%JAVA_HOME%\lib\tools.jar;..\..\..\build\lib\ant.jar;..\..\..\build\lib\ant-contrib.jar;..\lib\
activation.jar;..\lib\
bouncycastle.jar;..\lib\commons-el.jar;..\lib\hsqldb.jar;..\lib\jasper-compiler.jar;..\lib\jasper-runtime.jar;..\lib\jtds.jar;..\lib\mail.jar;..\lib\mysql.jar;..\lib\postgres.jar;..\lib\servlet-api.jar;..\lib\startup.jar;..\lib\openfire.jar" org.jivesoftware.openfire.starter.ServerStarter
start "Openfire" "%JAVA_HOME%\bin\java" -DopenfireHome="%OPENFIRE_HOME%" -Xdebug -Xint -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -DdevelopmentMode="true" -D%PLUGIN_WEBROOT% -D%PLUGIN_CLASSES% -server -cp "%JAVA_HOME%\lib\tools.jar;..\..\..\build\lib\ant.jar;..\..\..\build\lib\ant-contrib.jar;..\lib\bouncycastle.jar;..\lib\commons-el.jar;..\lib\hsqldb.jar;..\lib\jasper-compiler.jar;..\lib\jasper-runtime.jar;..\lib\jtds.jar;..\lib\mail.jar;..\lib\mysql.jar;..\lib\postgres.jar;..\lib\servlet-api.jar;..\lib\startup.jar;..\lib\openfire.jar" org.jivesoftware.openfire.starter.ServerStarter
goto end
:end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment