Skip to content

Commit

Permalink
Reformat xml/html/css/js/xsd files using IntelliJ styles.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Zhou committed Jun 12, 2012
1 parent b123218 commit f1eef6c
Show file tree
Hide file tree
Showing 364 changed files with 2,358 additions and 2,351 deletions.
4 changes: 2 additions & 2 deletions common/expr/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>citrus-parent</artifactId>
<groupId>com.alibaba.citrus</groupId>
Expand Down
4 changes: 2 additions & 2 deletions common/generictype/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>citrus-parent</artifactId>
<groupId>com.alibaba.citrus</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
</head>
<body>
<p>Package <code>com.alibaba.citrus.generictype.introspect</code>中,包含了分析类型内部结构的工具,例如,取得类型的properties。</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
</head>
<body>
<p>Package <code>com.alibaba.citrus.generictype</code>中,包含了分析generic类型的工具。</p>
Expand Down
40 changes: 20 additions & 20 deletions common/hessian/pom.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>citrus-parent</artifactId>
<groupId>com.alibaba.citrus</groupId>
<version>3.0.8</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>citrus-common-hessian</artifactId>
<name>Hessian Port</name>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>citrus-parent</artifactId>
<groupId>com.alibaba.citrus</groupId>
<version>3.0.8</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>citrus-common-hessian</artifactId>
<name>Hessian Port</name>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</project>
4 changes: 2 additions & 2 deletions common/logconfig/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>citrus-parent</artifactId>
<groupId>com.alibaba.citrus</groupId>
Expand Down
4 changes: 2 additions & 2 deletions common/logconfig/src/test/config/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
">

Expand Down
4 changes: 2 additions & 2 deletions common/logconfig/src/test/config/WEB-INF/web2.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
">

Expand Down
2 changes: 1 addition & 1 deletion common/springext/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>citrus-parent</artifactId>
<groupId>com.alibaba.citrus</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.alibaba.com/schema/springext/base"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
targetNamespace="http://www.alibaba.com/schema/springext/base"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">

<xsd:import namespace="http://www.springframework.org/schema/beans"
schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />

<xsd:attributeGroup name="identifiedTypeAttributeSubset">
<xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
xmlns="http://java.sun.com/xml/ns/javaee"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
<listener>
<listener-class>com.alibaba.citrus.logconfig.LogConfiguratorListener</listener-class>
</listener>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function registerToggleTargetNamespace() {
var checkbox = $('toggleTargetNamespace');
var checkboxOnClick = function(event) {
$$("li.no-target-namespace").each( function(e) {
var checkboxOnClick = function (event) {
$$("li.no-target-namespace").each(function (e) {
if (checkbox.checked) {
e.show();
} else {
Expand All @@ -16,7 +16,7 @@ function registerToggleTargetNamespace() {

function registerToggleXmlTemplate() {
var checkbox = $('toggleXmlTemplate');
var checkboxOnClick = function(event) {
var checkboxOnClick = function (event) {
if (checkbox.checked) {
$('xml-template').show();
} else {
Expand All @@ -31,54 +31,54 @@ function registerToggleXmlTemplate() {

function registerUpdateXmlTemplate() {
var checkboxes = $$('li input[type="checkbox"]');
var updateXmlTemplate = function(event) {
var updateXmlTemplate = function (event) {
var checkbox = event == null ? null : event.target;
var currentNs = checkbox != null && checkbox.checked ? checkbox.name
.split(';')[0] : null;
.split(';')[0] : null;
var beans = false;
var beansNames = null;
var xml = '<pre class="xml-template">';
var locations = '';

xml += '<?xml version="1.0" encoding="UTF-8" ?>\n'.escapeHTML();
xml += '<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n'
.escapeHTML();
.escapeHTML();

checkboxes
.each( function(e) {
var names = e.name.split(';');

if (beansNames == null
&& names[0] == 'http://www.springframework.org/schema/beans') {
beans = e.checked;
beansNames = names;
}

if (e.checked) {
var decl = (' xmlns:' + names[1] + '="'
+ names[0] + '"\n').escapeHTML();
var loc = (' ' + names[0] + ' '
+ names[2] + '\n').escapeHTML();

if (currentNs == names[0]) {
xml += '<em>' + decl + '</em>';
locations += '<em>' + loc + '</em>';
} else {
xml += decl;
locations += loc;
}
}
});
.each(function (e) {
var names = e.name.split(';');

if (beansNames == null
&& names[0] == 'http://www.springframework.org/schema/beans') {
beans = e.checked;
beansNames = names;
}

if (e.checked) {
var decl = (' xmlns:' + names[1] + '="'
+ names[0] + '"\n').escapeHTML();
var loc = (' ' + names[0] + ' '
+ names[2] + '\n').escapeHTML();

if (currentNs == names[0]) {
xml += '<em>' + decl + '</em>';
locations += '<em>' + loc + '</em>';
} else {
xml += decl;
locations += loc;
}
}
});

if (!beans && beansNames != null) {
xml += (' xmlns:' + beansNames[1] + '="'
+ beansNames[0] + '"\n').escapeHTML();
+ beansNames[0] + '"\n').escapeHTML();
locations += (' ' + beansNames[0] + ' '
+ beansNames[2] + '\n').escapeHTML();
+ beansNames[2] + '\n').escapeHTML();
}

xml += ' xmlns:p="http://www.springframework.org/schema/p"\n'
.escapeHTML();
.escapeHTML();

xml += ' xsi:schemaLocation="\n'.escapeHTML();
xml += locations;
Expand All @@ -90,15 +90,15 @@ function registerUpdateXmlTemplate() {
$('xml-template').innerHTML = xml;
};

checkboxes.each( function(e) {
checkboxes.each(function (e) {
e.observe('click', updateXmlTemplate);
})

updateXmlTemplate(null);
}

function registerDirectoryHandle() {
var handleClick = function(event) {
var handleClick = function (event) {
var imgObj = event.target;
var imgSrc = imgObj.src;
var subdirs = imgObj.id.gsub(/^handle-/, 'subdirs-');
Expand All @@ -115,12 +115,12 @@ function registerDirectoryHandle() {
}
};

$$('li.directory>img').each( function(e) {
$$('li.directory>img').each(function (e) {
e.observe('click', handleClick);
});
}

document.observe("dom:loaded", function() {
document.observe("dom:loaded", function () {
registerToggleXmlTemplate();
registerToggleTargetNamespace();
registerUpdateXmlTemplate();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
li.no-target-namespace {
filter: alpha(opacity=50);
filter: alpha(opacity = 50);
}

li.no-target-namespace li.no-target-namespace {
filter: alpha(opacity=100);
filter: alpha(opacity = 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ a {
text-decoration: none;
}

a:link,a:visited {
a:link, a:visited {

}

a:hover,a:active {
a:hover, a:active {
font-weight: bold
}

Expand All @@ -40,12 +40,12 @@ a:hover,a:active {
background-color: inherit;
}

li.file,li.directory {
li.file, li.directory {
list-style: none;
white-space: nowrap;
}

li.file img,li.directory img {
li.file img, li.directory img {
margin: 2px;
}

Expand All @@ -60,7 +60,7 @@ div.control-bar span {
padding: 10px;
}

.code,.xml-template {
.code, .xml-template {
font-family: Consolas, "Courier New", Courier, monospace;
font-size: small;
}
Expand Down
7 changes: 4 additions & 3 deletions common/springext/src/test/config/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
">

<servlet>
<servlet-name>servlet</servlet-name>
<servlet-class>
com.alibaba.citrus.springext.support.context.XmlWebApplicationContextTests$NoopServlet</servlet-class>
com.alibaba.citrus.springext.support.context.XmlWebApplicationContextTests$NoopServlet
</servlet-class>
</servlet>

<filter>
Expand Down
6 changes: 3 additions & 3 deletions common/springext/src/test/config/beans-autowire-parent.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
">

<beans:bean
class="com.alibaba.citrus.springext.support.context.InheritableBeanFactoryTests$RequestPostProcessor" />
class="com.alibaba.citrus.springext.support.context.InheritableBeanFactoryTests$RequestPostProcessor" />

</beans:beans>
6 changes: 3 additions & 3 deletions common/springext/src/test/config/beans-autowire.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
">

<beans:bean id="autowiredObject"
class="com.alibaba.citrus.springext.support.context.InheritableBeanFactoryTests$MyObject" />
class="com.alibaba.citrus.springext.support.context.InheritableBeanFactoryTests$MyObject" />

</beans:beans>
Loading

0 comments on commit f1eef6c

Please sign in to comment.