Skip to content
This repository has been archived by the owner on Apr 13, 2022. It is now read-only.

URL Cleanup #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Changes in version 1.0.2.RELEASE (02.08.2010)
General
* Spring Security 3 support has been added and the bundled Test Drive sample now has an additional Maven build
profile for building the sample to use Spring 3 and Spring Security 3. See the docs at
http://static.springsource.org/spring-flex/docs/1.0.x/reference/html/ch06.html for instructions on how to enable
https://docs.spring.io/spring-flex/docs/1.0.x/reference/html/ch06.html for instructions on how to enable
this optional profile.

Enhancements
Expand Down Expand Up @@ -202,7 +202,7 @@ Bug Fixes
Changes in version 1.0.0.RELEASE (06.09.2009)
-----------------------------------------
General
* Maven central compatible POMs will be mirrored to http://repo1.maven.org
* Maven central compatible POMs will be mirrored to https://repo1.maven.org
* Marked Jackson and CGLib dependencies as required in ivy and pom configurations since they are almost always needed in practice
* Added documentation about using Spring MVC controllers alongside Spring BlazeDS Integration in the same application.

Expand All @@ -216,7 +216,7 @@ Changes in version 1.0.0.RC2 (05.19.2009)
-----------------------------------------
General
* The Test Drive samples are now included in the distribution and configured for use with Eclipse WTP
* Maven central compatible POMs have been published to the repository at http://maven.springframework.org/milestone/
* Maven central compatible POMs have been published to the repository at https://maven.springframework.org/milestone/
* Minor revisions to the documentation including a new chapter on working with the test drive sample

Enhancements
Expand Down Expand Up @@ -287,7 +287,7 @@ Bug Fixes
Changes in version 1.0.0.M1 (12.15.2008)
----------------------------------------
General
* Performed an initial code drop at http://src.springframework.org/svn/spring-flex
* Performed an initial code drop at https://src.springframework.org/svn/spring-flex
* Organized project structure to use spring-build and create OSGi-ready build artifacts
* Added an initial draft of the reference manual

Expand Down
2 changes: 1 addition & 1 deletion docbkx/resources/xsl/highlight-fo.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:xslthl="http://xslthl.sf.net"
xmlns:xslthl="http://xslthl.sourceforge.net/"
exclude-result-prefixes="xslthl"
version='1.0'>

Expand Down
2 changes: 1 addition & 1 deletion docbkx/resources/xsl/highlight.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Simple highlighter for HTML output. Follows the Eclipse color scheme.
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xslthl="http://xslthl.sf.net"
xmlns:xslthl="http://xslthl.sourceforge.net/"
exclude-result-prefixes="xslthl"
version='1.0'>

Expand Down
6 changes: 3 additions & 3 deletions docbkx/resources/xsl/html.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:xslthl="http://xslthl.sf.net"
xmlns:xslthl="http://xslthl.sourceforge.net/"
exclude-result-prefixes="xslthl"
version="1.0">

Expand Down Expand Up @@ -93,11 +93,11 @@
<!-- let's have a Spring and I21 banner across the top of each page -->
<xsl:template name="user.header.navigation">
<div style="background-color:white;border:none;height:73px;border:1px solid black;">
<a style="border:none;" href="http://www.springframework.org/osgi/"
<a style="border:none;" href="https://www.springframework.org/osgi/"
title="The Spring Framework - Spring Data">
<img style="border:none;" src="images/xdev-spring_logo.jpg"/>
</a>
<a style="border:none;" href="http://www.SpringSource.com/" title="SpringSource - Spring from the Source">
<a style="border:none;" href="https://www.SpringSource.com/" title="SpringSource - Spring from the Source">
<img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2-banner-rhs.png"/>
</a>
</div>
Expand Down
6 changes: 3 additions & 3 deletions docbkx/resources/xsl/html_chunk.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
<!-- let's have a Spring and I21 banner across the top of each page -->
<xsl:template name="user.header.navigation">
<div style="background-color:white;border:none;height:73px;border:1px solid black;">
<a style="border:none;" href="http://www.springframework.org/osgi/"
<a style="border:none;" href="https://www.springframework.org/osgi/"
title="The Spring Framework - Spring Data">
<img style="border:none;" src="images/xdev-spring_logo.jpg"/>
</a>
<a style="border:none;" href="http://www.SpringSource.com/" title="SpringSource - Spring from the Source">
<a style="border:none;" href="https://www.SpringSource.com/" title="SpringSource - Spring from the Source">
<img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2-banner-rhs.png"/>
</a>
</div>
Expand Down Expand Up @@ -200,7 +200,7 @@
</td>
<td width="20%" align="center">
<span style="color:white;font-size:90%;">
<a href="http://www.SpringSource.com/"
<a href="https://www.SpringSource.com/"
title="SpringSource - Spring from the Source">Sponsored by SpringSource
</a>
</span>
Expand Down
4 changes: 2 additions & 2 deletions notice.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
======================================================================

This product includes software developed by
the Apache Software Foundation (http://www.apache.org).
the Apache Software Foundation (https://www.apache.org).

The end-user documentation included with a redistribution, if any,
must include the following acknowledgement:

"This product includes software developed by the Spring Framework
Project (http://www.springframework.org)."
Project (https://www.springframework.org)."

Alternately, this acknowledgement may appear in the software itself,
if and wherever such third-party acknowledgements normally appear.
Expand Down
4 changes: 2 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ You will find issues one the Spring Flex JIRA at https://jira.spring.io/browse/F
4. DISTRIBUTION JAR FILES
-------------------------

Spring Flex snapshot builds are available from http://repo.spring.io/libs-snapshot/
SPring Flex release candidates are available from http://repo.spring.io/libs-milestone/
Spring Flex snapshot builds are available from https://repo.spring.io/libs-snapshot/
SPring Flex release candidates are available from https://repo.spring.io/libs-milestone/
Spring Flex release builds are available from Maven Central.

They are using the org.springframework.flex groupId.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ A XML-based DSL for configuring Spring BlazeDS Integration.
</xsd:documentation>
</xsd:annotation>

<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.0.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="https://www.springframework.org/schema/beans/spring-beans-3.0.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="https://www.springframework.org/schema/tool/spring-tool-3.0.xsd" />


<xsd:element name="message-broker">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ A XML-based DSL for configuring Spring BlazeDS Integration.
</xsd:documentation>
</xsd:annotation>

<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.0.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="https://www.springframework.org/schema/beans/spring-beans-4.0.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="https://www.springframework.org/schema/tool/spring-tool-4.0.xsd" />


<xsd:element name="message-broker">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,18 @@ public void setUp() {
this.broker = new MessageBroker();

when(this.endpoint1.getId()).thenReturn("bar");
when(this.endpoint1.getUrl()).thenReturn("http://foo.com/bar");
when(this.endpoint1.getUrl()).thenReturn("http://www.foo.com/bar");
when(this.endpoint1.serviceMessage(this.testMessage)).thenReturn(this.testMessage);
this.broker.addEndpoint(this.endpoint1);

when(this.endpoint2.getId()).thenReturn("baz");
when(this.endpoint2.getUrl()).thenReturn("http://foo.com/baz");
when(this.endpoint2.getUrl()).thenReturn("http://www.foo.com/");
when(this.endpoint2.serviceMessage(this.testMessage)).thenReturn(this.testMessage);
this.broker.addEndpoint(this.endpoint2);

this.endpoint3 = new CustomEndpoint();
this.endpoint3.setId("custom");
this.endpoint3.setUrl("http://foo.com/custom");
this.endpoint3.setUrl("http://www.foo.com/");
this.broker.addEndpoint(this.endpoint3);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void loginCommand() throws Exception {

@Test
public void serviceAuthorized() throws Exception {
when(this.endpoint.getUrlForClient()).thenReturn("http://foo.com/bar/spring/messagebroker/amf");
when(this.endpoint.getUrlForClient()).thenReturn("http://www.foo.com/");
when(this.endpoint.serviceMessage(this.inMessage)).thenReturn(this.outMessage);

List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
Expand Down Expand Up @@ -169,7 +169,7 @@ public void serviceUnauthorized() throws Exception {

@Test
public void serviceUnsecured() throws Exception {
when(this.endpoint.getUrlForClient()).thenReturn("http://foo.com/bar/spring/messagebroker/amfpolling");
when(this.endpoint.getUrlForClient()).thenReturn("http://www.foo.com/");
when(this.endpoint.serviceMessage(this.inMessage)).thenReturn(this.outMessage);

Message result = this.advisedEndpoint.serviceMessage(this.inMessage);
Expand Down
2 changes: 1 addition & 1 deletion spring-flex-integration/src/main/webapp/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "https://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
for building rich Internet applications that get delivered via the
Flash Player or to desktops via Adobe AIR.

Learn more about Flex at http://flex.org
Learn more about Flex at https://flex.org
// -->

<head>
Expand Down Expand Up @@ -72,7 +72,7 @@
"name", "chat",
"allowScriptAccess","sameDomain",
"type", "application/x-shockwave-flash",
"pluginspage", "http://www.adobe.com/go/getflashplayer"
"pluginspage", "https://www.adobe.com/go/getflashplayer"
);
} else if (hasRequestedVersion) {
// if we've detected an acceptable version
Expand All @@ -88,20 +88,20 @@
"name", "chat",
"allowScriptAccess","sameDomain",
"type", "application/x-shockwave-flash",
"pluginspage", "http://www.adobe.com/go/getflashplayer"
"pluginspage", "https://www.adobe.com/go/getflashplayer"
);
} else { // flash is too old or we can't detect the plugin
var alternateContent = 'Alternate HTML content should be placed here. '
+ 'This content requires the Adobe Flash Player. '
+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+ '<a href=https://www.adobe.com/go/getflash/>Get Flash</a>';
document.write(alternateContent); // insert non-flash content
}
// -->
</script>
<noscript>
<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
id="chat" width="100%" height="100%"
codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
codebase="https://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
<param name="movie" value="chat.swf" />
<param name="quality" value="high" />
<param name="bgcolor" value="#869ca7" />
Expand All @@ -113,7 +113,7 @@
quality="high"
allowScriptAccess="sameDomain"
type="application/x-shockwave-flash"
pluginspage="http://www.adobe.com/go/getflashplayer">
pluginspage="https://www.adobe.com/go/getflashplayer">
</embed>
</object>
</noscript>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
for building rich Internet applications that get delivered via the
Flash Player or to desktops via Adobe AIR.

Learn more about Flex at http://flex.org
Learn more about Flex at https://flex.org
// -->

<head>
Expand Down Expand Up @@ -72,7 +72,7 @@
"name", "collaboration",
"allowScriptAccess","sameDomain",
"type", "application/x-shockwave-flash",
"pluginspage", "http://www.adobe.com/go/getflashplayer"
"pluginspage", "https://www.adobe.com/go/getflashplayer"
);
} else if (hasRequestedVersion) {
// if we've detected an acceptable version
Expand All @@ -88,20 +88,20 @@
"name", "collaboration",
"allowScriptAccess","sameDomain",
"type", "application/x-shockwave-flash",
"pluginspage", "http://www.adobe.com/go/getflashplayer"
"pluginspage", "https://www.adobe.com/go/getflashplayer"
);
} else { // flash is too old or we can't detect the plugin
var alternateContent = 'Alternate HTML content should be placed here. '
+ 'This content requires the Adobe Flash Player. '
+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+ '<a href=https://www.adobe.com/go/getflash/>Get Flash</a>';
document.write(alternateContent); // insert non-flash content
}
// -->
</script>
<noscript>
<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
id="collaboration" width="100%" height="100%"
codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
codebase="https://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
<param name="movie" value="collaboration.swf" />
<param name="quality" value="high" />
<param name="bgcolor" value="#869ca7" />
Expand All @@ -113,7 +113,7 @@
quality="high"
allowScriptAccess="sameDomain"
type="application/x-shockwave-flash"
pluginspage="http://www.adobe.com/go/getflashplayer">
pluginspage="https://www.adobe.com/go/getflashplayer">
</embed>
</object>
</noscript>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
for building rich Internet applications that get delivered via the
Flash Player or to desktops via Adobe AIR.

Learn more about Flex at http://flex.org
Learn more about Flex at https://flex.org
// -->

<head>
Expand Down Expand Up @@ -72,7 +72,7 @@
"name", "companymgr",
"allowScriptAccess","sameDomain",
"type", "application/x-shockwave-flash",
"pluginspage", "http://www.adobe.com/go/getflashplayer"
"pluginspage", "https://www.adobe.com/go/getflashplayer"
);
} else if (hasRequestedVersion) {
// if we've detected an acceptable version
Expand All @@ -88,20 +88,20 @@
"name", "companymgr",
"allowScriptAccess","sameDomain",
"type", "application/x-shockwave-flash",
"pluginspage", "http://www.adobe.com/go/getflashplayer"
"pluginspage", "https://www.adobe.com/go/getflashplayer"
);
} else { // flash is too old or we can't detect the plugin
var alternateContent = 'Alternate HTML content should be placed here. '
+ 'This content requires the Adobe Flash Player. '
+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+ '<a href=https://www.adobe.com/go/getflash/>Get Flash</a>';
document.write(alternateContent); // insert non-flash content
}
// -->
</script>
<noscript>
<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
id="companymgr" width="100%" height="100%"
codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
codebase="https://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
<param name="movie" value="companymgr.swf" />
<param name="quality" value="high" />
<param name="bgcolor" value="#869ca7" />
Expand All @@ -113,7 +113,7 @@
quality="high"
allowScriptAccess="sameDomain"
type="application/x-shockwave-flash"
pluginspage="http://www.adobe.com/go/getflashplayer">
pluginspage="https://www.adobe.com/go/getflashplayer">
</embed>
</object>
</noscript>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
Expand Down
Loading