Jesse McConnell
b963840d40
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:29:14 -05:00
Jesse McConnell
a652ee7396
[maven-release-plugin] prepare release jetty-7.6.3.v20120413
2012-04-13 15:29:05 -05:00
Simone Bordet
72040202d4
Reverted release back to 8.1.3-SNAPSHOT.
2012-04-13 17:27:37 +02:00
Simone Bordet
85710fb9ea
Reverted release back to 7.6.3-SNAPSHOT.
2012-04-13 16:59:06 +02:00
Jesse McConnell
3b87e91cbe
[maven-release-plugin] prepare for next development iteration
2012-04-12 10:29:30 -05:00
Jesse McConnell
308b010744
[maven-release-plugin] prepare release jetty-8.1.3.v20120412
2012-04-12 10:29:20 -05:00
Jesse McConnell
cdcc0922c3
[maven-release-plugin] prepare for next development iteration
2012-04-12 09:49:52 -05:00
Jesse McConnell
5966c86571
[maven-release-plugin] prepare release jetty-7.6.3.v20120412
2012-04-12 09:49:46 -05:00
Greg Wilkins
ee2d289f63
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-npn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
2012-04-12 16:02:34 +10:00
Jan Bartel
792b101639
Update version in MANIFESTs
2012-04-04 15:13:02 +10:00
Jan Bartel
48982ced4a
Fix up version number in manifests; reformat code; tidy xml and tweak
2012-03-21 16:39:55 +11:00
Jesse McConnell
b4985ad0d5
[maven-release-plugin] prepare for next development iteration
2012-03-08 23:53:50 -06:00
Jesse McConnell
7a99af4ffe
[maven-release-plugin] prepare release jetty-8.1.2.v20120308
2012-03-08 23:53:42 -06:00
Jan Bartel
5b98ee4e1d
Fix manifest versions.
2012-03-09 15:38:44 +11:00
Jesse McConnell
246e3ed756
[maven-release-plugin] prepare for next development iteration
2012-03-08 21:09:46 -06:00
Jesse McConnell
a63b3fdc5e
[maven-release-plugin] prepare release jetty-7.6.2.v20120308
2012-03-08 21:09:37 -06:00
Jesse McConnell
2e61650264
merge from master and adjust osgi bits
2012-03-08 20:32:20 -06:00
Jan Bartel
b77ad34ef0
Fix versions in manifests, fix typo in jetty-osgi-default.xml, ensure Required-TldBundles are on the classpath.
...
Still doesn't work with version of jsp in jetty-7.6, as the jsp compiler cannot load the class org.glassfish.jsp.api.ResourceInjector, still trying to figure that out.
2012-03-09 11:40:52 +11:00
Jesse McConnell
50d92ec8ef
reset versions
2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c
reset versions
2012-03-06 17:06:10 -06:00
Jesse McConnell
d1c8c477ea
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f
[maven-release-plugin] prepare release jetty-8.1.2.v20120302
2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
Jesse McConnell
ac79497dee
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:29:36 -06:00
Jesse McConnell
3705b424c8
[maven-release-plugin] prepare release jetty-8.1.1.v20120215
2012-02-15 14:29:28 -06:00
Jesse McConnell
efb6883cf0
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:22:19 -06:00
Jesse McConnell
baf2b94f77
[maven-release-plugin] prepare release jetty-7.6.1.v20120215
2012-02-15 14:22:12 -06:00
Jesse McConnell
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
Joakim Erdfelt
fdaad62b63
Migrating old javax.* deps to new org.eclipse.jetty.orbit deps
...
+ Removed old deps in javax.*, geronimo, and asm in favor of
new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
2012-01-31 15:21:58 -07:00
Jesse McConnell
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
Jesse McConnell
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
Jesse McConnell
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
Jesse McConnell
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
Jesse McConnell
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
Jesse McConnell
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
Jesse McConnell
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
Jesse McConnell
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
Jesse McConnell
ec731e691d
[maven-release-plugin] prepare for next development iteration
2012-01-20 12:28:31 -06:00
Jesse McConnell
6004fd4553
[maven-release-plugin] prepare release jetty-8.1.0.RC5
2012-01-20 12:28:24 -06:00
Jesse McConnell
16833ca8c9
[maven-release-plugin] prepare for next development iteration
2012-01-20 10:50:24 -06:00
Jesse McConnell
dd80d7e868
[maven-release-plugin] prepare release jetty-7.6.0.RC5
2012-01-20 10:50:14 -06:00
Jesse McConnell
8725172017
[maven-release-plugin] prepare for next development iteration
2012-01-13 09:45:25 -06:00
Jesse McConnell
a2349abbcc
[maven-release-plugin] prepare release jetty-8.1.0.RC4
2012-01-13 09:45:18 -06:00
Jesse McConnell
45cf0552fc
[maven-release-plugin] prepare for next development iteration
2012-01-13 08:37:25 -06:00
Jesse McConnell
ec589eed33
[maven-release-plugin] prepare release jetty-7.6.0.RC4
2012-01-13 08:37:19 -06:00
Jan Bartel
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
Jesse McConnell
0fa4fa9b23
clean up some warnings from maven
2012-01-09 14:57:21 -06:00
hmalphettes
89afbdf31d
360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6
2011-12-02 17:27:26 +08:00
Greg Wilkins
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941
, reversing
changes made to df12605f0e
.
2011-11-30 16:27:30 +11:00
Greg Wilkins
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
Greg Wilkins
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
Jan Bartel
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
Jesse McConnell
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
Jesse McConnell
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
Greg Wilkins
5140a95144
refactored HttpConnection name
2011-10-20 15:12:19 +11:00
Jesse McConnell
a38f2a9e68
[maven-release-plugin] prepare for next development iteration
2011-10-11 10:16:54 -05:00
Jesse McConnell
55a1be5435
[maven-release-plugin] prepare release jetty-8.0.3.v20111011
2011-10-11 10:16:47 -05:00
Jesse McConnell
7d10182034
[maven-release-plugin] prepare for next development iteration
2011-10-11 08:47:07 -05:00
Jesse McConnell
b6ac542604
[maven-release-plugin] prepare release jetty-7.5.3.v20111011
2011-10-11 08:47:00 -05:00
Jesse McConnell
b55ec9bac1
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:59:52 -05:00
Jesse McConnell
e32e8b1377
[maven-release-plugin] prepare release jetty-8.0.2.v20111006
2011-10-06 17:59:46 -05:00
Jesse McConnell
0c55c774d4
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:25:38 -05:00
Jesse McConnell
4d822759de
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 17:25:32 -05:00
Jesse McConnell
b58006b4a4
[maven-release-plugin] prepare for next development iteration
2011-10-06 09:43:37 -05:00
Jesse McConnell
7eca345e8d
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 09:43:31 -05:00
Jesse McConnell
d5304b2cbc
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:20:15 -05:00
Jesse McConnell
c33548d38a
[maven-release-plugin] prepare release jetty-8.0.1.v20110908
2011-09-08 12:19:24 -05:00
Jesse McConnell
ebdb89dc23
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:00:16 -05:00
Jesse McConnell
932245a114
[maven-release-plugin] prepare release jetty-7.5.1.v20110908
2011-09-08 12:00:10 -05:00
Jesse McConnell
721c8ab682
updating version.txt and resetting pom version to 8.0.1-SNAPSHOT
2011-09-08 11:54:53 -05:00
Jesse McConnell
37d0f53b0a
updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT
2011-09-08 11:40:37 -05:00
Jesse McConnell
4e47d6a7fa
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:16:58 -05:00
Jesse McConnell
d77a12962b
[maven-release-plugin] prepare release jetty-8.0.1.v20110907
2011-09-07 18:16:50 -05:00
Jesse McConnell
6b614a54f0
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:12:16 -05:00
Jesse McConnell
ce55c8c601
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 18:12:09 -05:00
Jesse McConnell
1744b5bce1
reset from release
2011-09-07 11:09:46 -05:00
Jesse McConnell
ae86ad6d4e
[maven-release-plugin] prepare for next development iteration
2011-09-07 10:03:16 -05:00
Jesse McConnell
86383afbd2
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 10:03:10 -05:00
Jesse McConnell
40dcb10ed8
[maven-release-plugin] prepare for next development iteration
2011-09-01 12:24:32 -05:00
Jesse McConnell
db14b194fa
[maven-release-plugin] prepare release jetty-8.0.0.v20110901
2011-09-01 12:24:24 -05:00
Jesse McConnell
a728021edf
[maven-release-plugin] prepare for next development iteration
2011-09-01 11:17:05 -05:00
Jesse McConnell
882308f781
[maven-release-plugin] prepare release jetty-7.5.0.c20110901
2011-09-01 11:16:58 -05:00
Jesse McConnell
57e9045635
[maven-release-plugin] prepare for next development iteration
2011-08-31 14:17:32 -05:00
Jesse McConnell
317491a4d7
[maven-release-plugin] prepare release jetty-7.5.0.v20110901
2011-08-31 14:17:25 -05:00
Joakim Erdfelt
e60df19490
[maven-release-plugin] prepare for next development iteration
2011-08-30 13:13:46 -07:00
Joakim Erdfelt
460c754e4e
[maven-release-plugin] prepare release jetty-7.5.0.RC2
2011-08-30 13:13:39 -07:00
Joakim Erdfelt
7663a83616
[maven-release-plugin] rollback the release of jetty-7.5.0.RC2
2011-08-30 12:52:45 -07:00
Joakim Erdfelt
4c5c954d23
[maven-release-plugin] prepare release jetty-7.5.0.RC2
2011-08-30 12:47:42 -07:00
Greg Wilkins
e5a3cb9cef
[maven-release-plugin] prepare for next development iteration
2011-08-19 22:17:46 +10:00
Greg Wilkins
f0b4ffffda
[maven-release-plugin] prepare release jetty-7.5.0.RC1
2011-08-19 22:17:33 +10:00
Jesse McConnell
4700979200
[maven-release-plugin] prepare for next development iteration
2011-08-16 09:26:56 -05:00
Jesse McConnell
3ae78dfbb2
[maven-release-plugin] prepare release jetty-8.0.0.RC0
2011-08-16 09:26:48 -05:00
Jesse McConnell
4d7ba354e1
[maven-release-plugin] prepare for next development iteration
2011-08-15 14:18:53 -05:00
Jesse McConnell
2175bae0a0
[maven-release-plugin] prepare release jetty-7.5.0.RC0
2011-08-15 14:18:42 -05:00
Greg Wilkins
70d7d3c9a5
reverted version
2011-07-18 09:15:31 +10:00
Greg Wilkins
a26ddd5933
created performance version
2011-07-14 15:38:25 +10:00
Jesse McConnell
39674f8a8e
[maven-release-plugin] prepare for next development iteration
2011-07-07 18:43:56 -05:00
Jesse McConnell
5aa94f502e
[maven-release-plugin] prepare release jetty-7.4.4.v20110707
2011-07-07 18:43:50 -05:00
Greg Wilkins
17e907c2fb
git diff 54e885d967
remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10:00
Jesse McConnell
6190961f31
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:45 +00:00
Jesse McConnell
db9f79eaff
[maven-release-plugin] prepare release jetty-7.4.3.v20110701
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:33 +00:00
Greg Wilkins
baabacfe95
reverted to 7.4.4-SNAPSHOT
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 02:22:56 +00:00
Jesse McConnell
b9fffcb9a0
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:20 +00:00
Jesse McConnell
ea23a83bb3
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:07 +00:00
Jesse McConnell
b1ca45e709
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:49:20 +00:00
Jesse McConnell
5f5cb8ea53
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3439 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:39:23 +00:00
Jesse McConnell
54e885d967
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3289 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:20:58 +00:00
Jesse McConnell
e35f16bae5
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3287 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:14:37 +00:00
Jesse McConnell
64cbf74b09
reset poms for release
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3286 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 11:59:36 +00:00
Greg Wilkins
92c1a7bc5d
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3277 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 08:51:01 +00:00
Hugues Malphettes
b40d6ea5a3
clean up for 7.4.2 (not important)
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3248 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-24 07:33:28 +00:00
Hugues Malphettes
850170ba5f
bug 346605 commit the demo of jetty's continuation and webscoket to 'chat with the equinox console
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3221 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 08:33:57 +00:00
Jesse McConnell
51f6df9871
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3184 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:57:00 +00:00
Jesse McConnell
28e63af76b
[maven-release-plugin] prepare release jetty-project-7.4.2.vTEST
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3182 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:56:45 +00:00
Jesse McConnell
0793141d2c
[maven-release-plugin] rollback the release of jetty-project-7.4.2.vTEST
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3181 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:59 +00:00
Jesse McConnell
be9da35ef4
set for test
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3180 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:17 +00:00
Greg Wilkins
f8dc394adb
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3137 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:47 +00:00
Greg Wilkins
6e0649ab3f
[maven-release-plugin] prepare release jetty-7.4.1.v20110513
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3135 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:21 +00:00
Jesse McConnell
314a59192d
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3131 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:57:07 +00:00
Jesse McConnell
fadbd0bdc5
[maven-release-plugin] prepare release jetty-7.4.1.v20110512
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3129 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:56:53 +00:00
Greg Wilkins
5d0f1b88f4
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3128 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:46 +00:00
Greg Wilkins
83b6c19cca
[maven-release-plugin] prepare release jetty-7.4.1
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3126 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:19 +00:00
Hugues Malphettes
9ca191cd4a
bug 344529 Ability to customize the error handling of the OSGi HttpService
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3066 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 07:42:01 +00:00
Hugues Malphettes
25a7cc4ab7
bug 344529 Ability to customize the error handling of the OSGi HttpService
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3065 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 07:34:18 +00:00
Hugues Malphettes
6746c79e71
update the development environment to the current version.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3025 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-20 08:24:11 +00:00
Greg Wilkins
936b80dd46
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3018 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:30 +00:00
Greg Wilkins
a01a1edd70
[maven-release-plugin] prepare release jetty-7.4.0.v20110414
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3016 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:04 +00:00
Greg Wilkins
b43b2607ad
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2992 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:34 +00:00
Greg Wilkins
b6d04cc349
[maven-release-plugin] prepare release jetty-7.4.0.RC0
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2990 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:08 +00:00
Greg Wilkins
50541649ca
Get ready for 7.4 release
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2952 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 03:42:09 +00:00
Greg Wilkins
c2bc7a5ddd
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2864 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 05:42:13 +00:00
Greg Wilkins
1d5a6de9c7
[maven-release-plugin] prepare release jetty-7.3.1.v20110307
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2862 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 05:41:43 +00:00
Greg Wilkins
db438ca86f
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2854 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-04 03:58:46 +00:00
Greg Wilkins
70bd1c2085
[maven-release-plugin] prepare release jetty-7.3.1.v20110304
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2852 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-04 03:58:19 +00:00
Greg Wilkins
cdf2490336
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2739 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-03 11:46:23 +00:00
Greg Wilkins
8fddea6796
[maven-release-plugin] prepare release jetty-7.3.0.v20110203
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2737 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-03 11:45:58 +00:00
Jesse McConnell
e9e2236760
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2732 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 20:52:37 +00:00
Jesse McConnell
30de087cdd
[maven-release-plugin] prepare release jetty-7.3.0.20110202
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2730 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 20:52:24 +00:00
Jesse McConnell
1f576b96a8
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2725 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 14:43:14 +00:00
Jesse McConnell
ab06234807
[maven-release-plugin] prepare release jetty-7.3.0.v20110202
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2723 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 14:42:58 +00:00
Greg Wilkins
cfd2c0e7d2
revert to 7.3.0-SNAPSHOT
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2703 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-28 01:16:38 +00:00
Jesse McConnell
c9365cb777
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2684 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-24 19:48:29 +00:00
Jesse McConnell
4127ce5430
[maven-release-plugin] prepare release jetty-7.3.0.v20112401
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2682 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-24 19:48:11 +00:00
Greg Wilkins
7656b37934
switch trunk to 7.3.x
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2614 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-21 10:22:53 +00:00
Greg Wilkins
703aca3449
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2598 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 14:15:23 +00:00
Greg Wilkins
155d31e65e
[maven-release-plugin] prepare release jetty-7.2.2.v20101205
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2596 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 14:14:59 +00:00
Greg Wilkins
c73c4268e9
rolled back failed release
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2595 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 11:08:57 +00:00
Greg Wilkins
65524be6d0
gpg use agent
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2592 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 10:27:02 +00:00
Jesse McConnell
0ee51e7844
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2587 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 16:28:52 +00:00
Jesse McConnell
ef73282704
[maven-release-plugin] prepare release jetty-7.2.2.v20101203
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2585 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 16:28:37 +00:00
Jesse McConnell
28abc4cae5
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2581 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 15:48:00 +00:00
Jesse McConnell
8684dc5805
[maven-release-plugin] prepare release jetty-7.2.2.v20101203
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2579 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 15:47:47 +00:00
Jesse McConnell
e4f078cec6
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2572 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-01 19:42:49 +00:00
Jesse McConnell
fcab138ac8
[maven-release-plugin] prepare release jetty-7.2.2.v20101201
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2570 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-01 19:42:36 +00:00
Jesse McConnell
654544b5ec
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2563 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-30 20:06:11 +00:00
Jesse McConnell
e79f494d79
[maven-release-plugin] prepare release jetty-7.2.2.v20101201
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2561 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-30 20:05:47 +00:00
Jesse McConnell
62726cc4e2
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2498 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-11 16:20:20 +00:00
Jesse McConnell
e0b27726c2
[maven-release-plugin] prepare release jetty-7.2.1.v20101111
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2496 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-11 16:19:58 +00:00
Jesse McConnell
678e364270
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2494 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:33:07 +00:00
Jesse McConnell
d6b1040f69
[maven-release-plugin] prepare release jetty-7.2.1.v20101111
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2492 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:32:47 +00:00
Hugues Malphettes
786f0d2299
update the versions to 7.2.1 in our clumsy build system
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2382 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-21 11:59:38 +00:00
Jesse McConnell
87f58a2863
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2379 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-20 19:49:47 +00:00
Jesse McConnell
1a9136f4f0
[maven-release-plugin] prepare release jetty-7.2.0.v20101020
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2377 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-20 19:49:33 +00:00
Jesse McConnell
5ab4634dfb
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2367 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-19 19:49:45 +00:00
Jesse McConnell
83d4febd1e
[maven-release-plugin] prepare release jetty-7.2.0.v20101020
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2365 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-19 19:49:32 +00:00
Jesse McConnell
d84b549aca
reset version to remove RC# from version string to maintain support with osgi versioning
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2356 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-18 19:16:49 +00:00
Jesse McConnell
0fcbbbf1e9
reset version
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2355 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-18 18:47:42 +00:00
Jesse McConnell
9b07b75df7
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2354 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-15 20:33:58 +00:00
Jesse McConnell
933c065d1b
[maven-release-plugin] prepare release jetty-7.2.0.RC1
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2352 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-15 20:33:45 +00:00
Jesse McConnell
d389d12771
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2311 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-01 22:25:30 +00:00
Jesse McConnell
89bd58d11b
[maven-release-plugin] prepare release jetty-7.2.0.RC0
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2309 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-01 22:25:18 +00:00
Hugues Malphettes
f0fdcb065d
bug 325184: setup the servlet session on the servlet that hosts the OSGi HttpService
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2277 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-15 01:06:44 +00:00
Jesse McConnell
11d03a6f0b
fix broken osgi build, update filter targets to 7.2 (which we ought to just standardize so we don't have to change filters based on minor version and found source of issue being an unquoted version in DynamicImport in boot osgi
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2200 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-30 17:30:49 +00:00
Greg Wilkins
b02766dd53
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2078 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 14:10:04 +00:00
Greg Wilkins
82923e5197
[maven-release-plugin] prepare release jetty-7.1.5.v20100705
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2076 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 14:09:39 +00:00
Greg Wilkins
0fb891e968
rolled back r2014 because it is needed by codehaus release
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2074 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 13:50:26 +00:00
Greg Wilkins
a4d25de6c4
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2073 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 12:43:19 +00:00
Greg Wilkins
f2726d74d1
[maven-release-plugin] prepare release jetty-7.1.5.v20100705
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2071 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 12:42:53 +00:00
Hugues Malphettes
5fcc270059
fix the httpservice deployment: the servlet was not started automatically at deployment time
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2034 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-22 04:39:42 +00:00
Joakim Erdfelt
3e80a12185
Removing manual call to jar:jar and jar:test-jar.
...
jar:jar is part of the default lifecycle, no point declaring it again.
jar:test-jar isn't used by anything, no point generating, installing,
and deploying it.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2014 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-16 18:14:04 +00:00
Joakim Erdfelt
04d29783e3
Limiting scope of Findbugs run.
...
Configuring Reporting for PMD, Findbugs, JXR, JavaDoc.
Fixing PMD configuration inheritence bug with sub-projects.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2013 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-16 17:21:50 +00:00
Greg Wilkins
0104b834b8
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1995 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-11 00:17:47 +00:00
Greg Wilkins
8193236dba
[maven-release-plugin] prepare release jetty-7.1.4.v20100610
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1993 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-11 00:16:54 +00:00
Greg Wilkins
a70c798da6
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1987 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 06:20:13 +00:00
Greg Wilkins
5ee4d16dd2
[maven-release-plugin] prepare release jetty-7.1.4.v20100609
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1985 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 06:19:32 +00:00
Greg Wilkins
3ed02a05e7
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1979 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 01:54:22 +00:00
Greg Wilkins
14609bedfd
[maven-release-plugin] prepare release jetty-7.1.4.v20090609
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1977 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 01:53:46 +00:00
Greg Wilkins
7c7630bc75
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1974 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 00:38:09 +00:00
Greg Wilkins
725c514706
[maven-release-plugin] prepare release jetty-7.1.4.v20100609
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1972 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 00:37:23 +00:00
Joakim Erdfelt
991a2b4077
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1961 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 19:05:57 +00:00
Joakim Erdfelt
0d5e373020
[maven-release-plugin] prepare release jetty-7.1.4.v20100609
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1959 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 19:05:43 +00:00
Joakim Erdfelt
533ae0950d
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1897 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-26 19:14:50 +00:00
Joakim Erdfelt
e00a8d20d6
[maven-release-plugin] prepare release jetty-7.1.3.v20100526
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1895 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-26 19:14:23 +00:00
Greg Wilkins
610c20a37e
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1848 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-23 21:00:22 +00:00
Greg Wilkins
e71c645b06
[maven-release-plugin] prepare release jetty-7.1.2.v20100523
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1846 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-23 20:59:52 +00:00
Greg Wilkins
aa46212a2e
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1843 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-22 08:25:49 +00:00
Greg Wilkins
f1f2846fe4
[maven-release-plugin] prepare release jetty-7.1.2.v20100522
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1841 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-22 08:25:26 +00:00