You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/06/13 10:28:35 UTC
svn commit: r546777 -
/lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java
Author: andreas
Date: Wed Jun 13 01:28:34 2007
New Revision: 546777
URL: http://svn.apache.org/viewvc?view=rev&rev=546777
Log:
Made proxy transformer test more robust re. SSL / non SSL
Modified:
lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java
Modified: lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java?view=diff&rev=546777&r1=546776&r2=546777
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java (original)
+++ lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java Wed Jun 13 01:28:34 2007
@@ -73,9 +73,8 @@
String pubId = "mock";
String area = "authoring";
- boolean ssl = true;
- createMockPublication(pubId, area, ssl, proxyUrl);
+ createMockPublication(pubId, area, proxyUrl);
Context context = this.context;
Map objectModel = (Map) context.get(ContextHelper.CONTEXT_OBJECT_MODEL);
@@ -117,7 +116,7 @@
assertEquals(rewrittenUrl, targetUrl);
}
- protected void createMockPublication(String pubId, String area, boolean ssl, String proxyUrl)
+ protected void createMockPublication(String pubId, String area, String proxyUrl)
throws PublicationException, ServiceException, Exception {
if (!existsPublication(pubId)) {
@@ -128,7 +127,7 @@
selector = (ServiceSelector) getManager().lookup(Instantiator.ROLE + "Selector");
instantiator = (Instantiator) selector.select(defaultPub.getInstantiatorHint());
instantiator.instantiate(defaultPub, pubId, "Mock");
- configureProxy(area, ssl, proxyUrl);
+ configureProxy(area, proxyUrl);
} finally {
if (selector != null) {
if (instantiator != null) {
@@ -140,7 +139,7 @@
}
}
- protected void configureProxy(String area, boolean ssl, String proxyUrl)
+ protected void configureProxy(String area, String proxyUrl)
throws ServiceException, SourceNotFoundException, ParserConfigurationException,
SAXException, IOException, TransformerConfigurationException, TransformerException,
MalformedURLException {
@@ -154,10 +153,16 @@
dom.getDocumentElement().appendChild(proxies);
Element proxyElement = helper.createElement("proxy");
- proxyElement.setAttribute("ssl", Boolean.toString(ssl));
+ proxyElement.setAttribute("ssl", Boolean.toString(false));
proxyElement.setAttribute("area", area);
proxyElement.setAttribute("url", proxyUrl);
proxies.appendChild(proxyElement);
+
+ Element sslProxyElement = helper.createElement("proxy");
+ sslProxyElement.setAttribute("ssl", Boolean.toString(true));
+ sslProxyElement.setAttribute("area", area);
+ sslProxyElement.setAttribute("url", proxyUrl);
+ proxies.appendChild(sslProxyElement);
SourceUtil.writeDOM(dom, configUri, getManager());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org