You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2011/11/24 02:12:38 UTC
svn commit: r1205692 - in
/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc:
org.ops4j.pax.web.cfg org.ops4j.pax.web.cfg.empty.stub
Author: ffang
Date: Thu Nov 24 01:12:37 2011
New Revision: 1205692
URL: http://svn.apache.org/viewvc?rev=1205692&view=rev
Log:
[SMX4-980]rename etc/org.ops4j.pax.web.cfg to etc/org.ops4j.pax.web.cfg.empty.stub
Added:
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
- copied, changed from r1205687, servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg
Removed:
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub (from r1205687, servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub&p1=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg&r1=1205687&r2=1205692&rev=1205692&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub Thu Nov 24 01:12:37 2011
@@ -22,7 +22,13 @@
# This is a stub configuration file for pax-web ssl configuration.
# More details please refer to
# http://wiki.ops4j.org/display/paxweb/SSL+Configuration
-#
+# Important Notes: If file named org.ops4j.pax.web.cfg in etc folder,
+# Pax Web will always try to read configuration from
+ this file, so any org.ops4j.pax.web configuration
+ in http feature get ignored, that's why we name this
+ file as org.ops4j.pax.web.empty.stub.
+ If you need this configuration file, rename it to
+ org.ops4j.pax.web before use it.
#################################################################################
#org.osgi.service.http.secure.enabled=true
@@ -31,3 +37,5 @@
#org.ops4j.pax.web.ssl.keypassword=password
#org.osgi.service.http.port.secure=8443
org.ops4j.pax.web.config.file=etc/jetty.xml
+org.osgi.service.http.port=8181
+javax.servlet.context.tempdir=data/pax-web-jsp