You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/05/01 06:11:09 UTC
[18/50] [abbrv] openmeetings git commit: no jira: code clean-up
no jira: code clean-up
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/cd4359ad
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/cd4359ad
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/cd4359ad
Branch: refs/heads/3.1.x
Commit: cd4359ad6f7733895c291d6dcaf0e014b0626edc
Parents: 468f798
Author: Maxim Solodovnik <so...@apache.org>
Authored: Tue Jan 10 16:06:54 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Tue Jan 10 16:06:54 2017 +0000
----------------------------------------------------------------------
openmeetings-core/pom.xml | 6 --
.../test/xsd/GenerateConfigXsd.java | 52 -------------
.../test/xsd/GenerateWebsiteXsd.java | 82 --------------------
3 files changed, 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cd4359ad/openmeetings-core/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 70ee059..d5245fe 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -104,11 +104,5 @@
<artifactId>red5-client</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.thaiopensource</groupId>
- <artifactId>trang</artifactId>
- <version>20091111</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cd4359ad/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java
deleted file mode 100644
index cec59a2..0000000
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.test.xsd;
-
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
-import java.io.File;
-
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
-import com.thaiopensource.relaxng.translate.Driver;
-
-public class GenerateConfigXsd {
- private static final Logger log = Red5LoggerFactory.getLogger(GenerateConfigXsd.class, webAppRootKey);
-
- public static void main(String... args) {
- new GenerateConfigXsd();
- }
-
- public GenerateConfigXsd() {
- try {
-
- String[] args = {
- "src/main/webapp"+File.separatorChar+"openmeetings"+File.separatorChar+"public"+File.separatorChar+"config.xml",
- "src/main/webapp"+File.separatorChar+"openmeetings"+File.separatorChar+"public"+File.separatorChar+"config.xsd"
- };
-
- Driver.main(args);
-
- } catch (Exception err) {
- log.error("Error", err);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cd4359ad/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java
deleted file mode 100644
index 1ee2a35..0000000
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.test.xsd;
-
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
-import com.thaiopensource.relaxng.translate.Driver;
-
-public class GenerateWebsiteXsd {
- private static final Logger log = Red5LoggerFactory.getLogger(GenerateWebsiteXsd.class, webAppRootKey);
- private static String WEBSITE_ROOT_DIR = "xdocs";
-
- public static void main(String... args) {
- new GenerateWebsiteXsd();
- }
-
- public GenerateWebsiteXsd() {
- try {
-
- File curentDir = new File(WEBSITE_ROOT_DIR);
-
- System.err.println(curentDir.getAbsolutePath());
-
- // Get all XML Files of this Folder
- FilenameFilter ff = new FilenameFilter() {
- @Override
- public boolean accept(File b, String name) {
- File f = new File(b, name);
- return f.getName().contains(".xml");
- }
- };
-
- String[] allfiles = curentDir.list(ff);
-
- System.err.println("allfiles LENGTH " + allfiles.length);
-
- List<String> allfilesPlusXSD = new ArrayList<String>();
-
- for (String fileName : allfiles) {
- allfilesPlusXSD.add(WEBSITE_ROOT_DIR + File.separatorChar
- + fileName);
- }
-
- allfilesPlusXSD.add(WEBSITE_ROOT_DIR + File.separatorChar
- + "website.xsd");
-
- for (String fileName : allfilesPlusXSD) {
- System.err.println(fileName);
- }
-
- Driver.main(allfilesPlusXSD.toArray(new String[0]));
-
- } catch (Exception err) {
- log.error("Error", err);
- }
- }
-
-}