Skip to content

Commit

Permalink
Added difference between IC and master
Browse files Browse the repository at this point in the history
Signed-off-by: Sergii Kabashniuk <skabashnyuk@codenvy.com>
  • Loading branch information
Sergii Kabashniuk committed Feb 12, 2016
1 parent 867ec65 commit 2795099
Show file tree
Hide file tree
Showing 1,449 changed files with 471,541 additions and 806 deletions.
48 changes: 45 additions & 3 deletions assembly/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,55 @@ Project Description
--------------------
Che's objective is to create high performance developer environments by producing extensible, RESTful workspaces combined with a cloud IDE that can be customized with plug-ins. Tools are written in Java and run in the browser.

- [https://projects.eclipse.org/projects/technology.che](https://projects.eclipse.org/projects/technology.che)

Developer Resources
--------------------
Information regarding source code management, builds, and coding standards. Until Che has completed its initial CQs, all code contributions are made directly through commits or pull requests at http://github.com/codenvy/che.

- [https://projects.eclipse.org/projects/technology.che/developer](https://projects.eclipse.org/projects/technology.che/developer)
Reporting Issues
-----------------
A great way to contribute to the project is to send a detailed report when you
encounter an issue. We always appreciate a well-written, thorough bug report,
and will thank you for it!

Check that [our issue database](https://github.com/codenvy/che/issues)
doesn't already include that problem or suggestion before submitting an issue.
If you find a match, you can use the "subscribe" button to get notified on
updates. Do *not* leave random "+1" or "I have this too" comments, as they
only clutter the discussion, and don't help resolving it. However, if you
have ways to reproduce the issue or have additional information that may help
resolving the issue, please leave a comment.

When reporting issues, always include:

* The Che version that is installed.
* The full directory path of where Che is installed.
* The output of `docker version`.
* The output of `docker info`.
* The output of `java -version`.

Also include the steps required to reproduce the problem if possible and
applicable. This information will help us review and fix your issue faster.
When sending lengthy log-files, consider posting them as a gist (https://gist.github.com).
Don't forget to remove sensitive data from your logfiles before posting (you can
replace those parts with "REDACTED").

**Issue Report Template**:

```
Description of problem:
Che version:
Che install directory:
Docker version:
Java version:
Environment details (AWS, VirtualBox, physical, etc.):
How reproducible:
Steps to Reproduce:
1.
2.
3.
Actual Results:
Expected Results:
```

Contributor License Agreement
------------------------------
Expand Down
7 changes: 6 additions & 1 deletion assembly/assembly-ide-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>4.0.0-RC1-SNAPSHOT</version>
<version>4.0.0-RC4-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>
Expand Down Expand Up @@ -286,6 +286,11 @@
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ protected void configure() {

install(new org.eclipse.che.plugin.docker.machine.ext.LocalStorageModule());

bind(WorkspaceConfigValidator.class).to(org.eclipse.che.api.workspace.server.model.impl.WorkspaceConfigValidatorImpl.class);
bind(WorkspaceConfigValidator.class).to(org.eclipse.che.api.workspace.server.DefaultWorkspaceConfigValidator.class);
bind(MachineStateListener.class).asEagerSingleton();
bind(org.eclipse.che.api.machine.server.WsAgentLauncher.class).to(org.eclipse.che.api.machine.server.WsAgentLauncherImpl.class);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import com.google.inject.servlet.ServletModule;

import org.apache.catalina.filters.CorsFilter;
import org.eclipse.che.api.local.CheGuiceEverrestServlet;
import org.eclipse.che.api.machine.server.proxy.MachineExtensionProxyServlet;
import org.eclipse.che.env.local.server.SingleEnvironmentFilter;
Expand All @@ -20,6 +21,8 @@
import org.everrest.websockets.WSConnectionTracker;

import javax.inject.Singleton;
import java.util.HashMap;
import java.util.Map;

/** @author andrew00x */
@DynaModule
Expand All @@ -28,8 +31,27 @@ public class ApiServletModule extends ServletModule {
protected void configureServlets() {
getServletContext().addListener(new WSConnectionTracker());

bind(SingleEnvironmentFilter.class).in(Singleton.class);
final Map<String, String> corsFilterParams = new HashMap<>();
corsFilterParams.put("cors.allowed.origins", "*");
corsFilterParams.put("cors.allowed.methods", "GET," +
"POST," +
"HEAD," +
"OPTIONS," +
"PUT," +
"DELETE");
corsFilterParams.put("cors.allowed.headers", "Content-Type," +
"X-Requested-With," +
"accept," +
"Origin," +
"Access-Control-Request-Method," +
"Access-Control-Request-Headers");
corsFilterParams.put("cors.support.credentials", "true");
// preflight cache is available for 10 minutes
corsFilterParams.put("cors.preflight.maxage", "10");
bind(CorsFilter.class).in(Singleton.class);
filter("/*").through(CorsFilter.class, corsFilterParams);

bind(SingleEnvironmentFilter.class).in(Singleton.class);
filter("/*").through(SingleEnvironmentFilter.class);
serve("/ext/*").with(MachineExtensionProxyServlet.class);
serveRegex("^/api((?!(/(ws|eventbus)($|/.*)))/.*)").with(CheGuiceEverrestServlet.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ machine.docker.che_api.endpoint=http://che-host:8080/ide/api
# locally. If false, Docker only pulls image if it does not exist locally.
machine.docker.pull_image=true

# If the browser clients that are accessing Che are remote AND the configuraiton of Docker is an
# If the browser clients that are accessing Che are remote AND the configuration of Docker is an
# internal IP address or using Unix sockets, then remote browser clients will not be able to connect
# to the workspace. Set the Docker configuration so that Docker containers have an external IP
# address and provide this host or IP address here.
machine.docker.local_node_host=NULL

# URL path to api service.
# Browser clients use this to initiate REST communiations with workspace master
# Browser clients use this to initiate REST communications with workspace master
api.endpoint=http://localhost:${SERVER_PORT}/ide/api

#### Everrest is a Java Web Services toolkit that manages JAX-RS & web socket communications
Expand Down
12 changes: 6 additions & 6 deletions assembly/assembly-machine-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>4.0.0-RC1-SNAPSHOT</version>
<version>4.0.0-RC4-SNAPSHOT</version>
</parent>
<artifactId>assembly-machine-server</artifactId>
<packaging>pom</packaging>
<name>Che Assembly Machine Plugins :: Server</name>
<dependencies>
<dependency>
<groupId>com.codenvy.resources</groupId>
<artifactId>che-tomcat8-slf4j-logback</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>assembly-machine-war</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.che.lib</groupId>
<artifactId>che-tomcat8-slf4j-logback</artifactId>
<type>zip</type>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-machine-server/src/assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<unpack>true</unpack>
<outputDirectory></outputDirectory>
<includes>
<include>com.codenvy.resources:che-tomcat8-slf4j-logback</include>
<include>org.eclipse.che.lib:che-tomcat8-slf4j-logback</include>
</includes>
</dependencySet>
<dependencySet>
Expand Down
149 changes: 149 additions & 0 deletions assembly/assembly-machine-server/src/assembly/server.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
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.
-->
<!-- Note: A "Server" is not itself a "Container", so you may not
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
-->
<Server port="4405" shutdown="SHUTDOWN">
<Listener className="org.apache.catalina.startup.VersionLoggerListener" />
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html >
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-->
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
<Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
<Listener className="org.apache.catalina.mbeans.JmxRemoteLifecycleListener" rmiRegistryPortPlatform="32001"
rmiServerPortPlatform="32101"/>

<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
-->
<GlobalNamingResources>
<!-- Editable user database that can also be used by
UserDatabaseRealm to authenticate users
-->
<!--Resource name="UserDatabase" auth="Container"
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
pathname="conf/tomcat-users.xml" /-->
</GlobalNamingResources>

<!-- A "Service" is a collection of one or more "Connectors" that share
a single "Container" Note: A "Service" is not itself a "Container",
so you may not define subcomponents such as "Valves" at this level.
Documentation at /docs/config/service.html
-->
<Service name="Catalina">

<!--The connectors can use a shared executor, you can define one or more named thread pools-->
<!--
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
maxThreads="150" minSpareThreads="4"/>
-->


<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
Java AJP Connector: /docs/config/ajp.html
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-->
<Connector port="4401" protocol="org.apache.coyote.http11.Http11NioProtocol"
connectionTimeout="20000"
maxThreads="300"
compression="on"
compressionMinSize="2048"
noCompressionUserAgents=".*MSIE 6.*"
compressableMimeType="text/html,text/xml,text/plain,text/css,text/javascript,application/json,application/javascript"
redirectPort="8443"/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
-->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation that requires the JSSE
style configuration. When using the APR/native implementation, the
OpenSSL style configuration is required as described in the APR/native
documentation -->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->

<!-- Define an AJP 1.3 Connector on port 8009 -->
<!--Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /-->


<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
analyzes the HTTP headers included with the request, and passes them
on to the appropriate Host (virtual host).
Documentation at /docs/config/engine.html -->

<!-- You should set jvmRoute to support load-balancing via AJP ie :
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
<Engine name="Catalina" defaultHost="localhost">

<!--For clustering, please take a look at documentation at:
/docs/cluster-howto.html (simple how to)
/docs/config/cluster.html (reference documentation) -->
<!--
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-->

<!-- Use the LockOutRealm to prevent attempts to guess user passwords
via a brute-force attack -->
<Realm className="org.apache.catalina.realm.LockOutRealm">
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<!--Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/-->
</Realm>

<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="false">

<!-- SingleSignOn valve, share authentication between web applications
Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-->

<!-- Access log processes all example.
Documentation at: /docs/config/valve.html
Note: The pattern used is equivalent to using pattern="common" -->
<Valve className="ch.qos.logback.access.tomcat.LogbackValve" quiet="true"
filename="${catalina.home}/conf/logback-access-localhost.xml" />

</Host>
</Engine>
</Service>
</Server>
9 changes: 8 additions & 1 deletion assembly/assembly-machine-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>4.0.0-RC1-SNAPSHOT</version>
<version>4.0.0-RC4-SNAPSHOT</version>
</parent>
<artifactId>assembly-machine-war</artifactId>
<packaging>war</packaging>
Expand Down Expand Up @@ -174,6 +174,13 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<packagingExcludes>WEB-INF/lib/*gwt*.jar,WEB-INF/lib/gin-*.jar</packagingExcludes>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit 2795099

Please sign in to comment.