Skip to content

Commit

Permalink
Issue #24: Project name confusing with the Redox OS project
Browse files Browse the repository at this point in the history
 - redOx has been renamed to corrosion

Signed-off-by: Lucas Bullen <[email protected]>
  • Loading branch information
Lucas Bullen committed Feb 8, 2018
1 parent 86e95f2 commit c2b13af
Show file tree
Hide file tree
Showing 97 changed files with 338 additions and 335 deletions.
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>redOx</name>
<name>corrosion</name>
<comment></comment>
<projects>
</projects>
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ script:
else
mvn clean verify;
fi
after_failure: "cat /home/travis/build/LucasBullen/redOx/org.eclipse.redox.tests/target/work/data/.metadata/.log"
after_failure: "cat /home/travis/build/LucasBullen/corrosion/org.eclipse.corrosion.tests/target/work/data/.metadata/.log"
19 changes: 11 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# RedOx
# Corrosion

> Corrosion was formerly called RedOx, but required a name change due to naming overlap with another project ([See issue #24](https://github.com/LucasBullen/redOx/issues/24))
Support for Rust editing in Eclipse IDE.

RedOx (short for reduction–oxidation, the reaction that causes rust), is a Rust development plugin for the Eclipse IDE. Both [issue reports](https://github.com/LucasBullen/redOx/issues) and [pull requests](https://github.com/LucasBullen/redOx/pulls) are greatly appreciated.
Corrosion is a Rust development plugin for the Eclipse IDE. Both [issue reports](https://github.com/LucasBullen/corrosion/issues) and [pull requests](https://github.com/LucasBullen/corrosion/pulls) are greatly appreciated.

[![Build Status](https://travis-ci.org/LucasBullen/redOx.svg?branch=master)](https://travis-ci.org/LucasBullen/redOx)
[![Build Status](https://travis-ci.org/LucasBullen/corrosion.svg?branch=master)](https://travis-ci.org/LucasBullen/corrosion)

![Screenshot](images/editorOverview.png "Screenshot of RedOx editor")
![Screenshot](images/editorOverview.png "Screenshot of Corrosion editor")

## Installation
Refer to our [Installation Guide](documentation/Installation.md)
Expand All @@ -15,14 +18,14 @@ Refer to our [Installation Guide](documentation/Installation.md)
The Rustup and Cargo commands are required for accessing the language server and performing most tasks. Go into the Rust preferences and either install the commands or input their paths if not automatically found.

## Contributing
[Issue reports](https://github.com/LucasBullen/redOx/issues) and [pull requests](https://github.com/LucasBullen/redOx/pulls) are always appreciated.
[Issue reports](https://github.com/LucasBullen/corrosion/issues) and [pull requests](https://github.com/LucasBullen/corrosion/pulls) are always appreciated.

For setting up RedOx for testing and development follow the [Using Github Installation Instructions](documentation/Installation.md#using-github)
For setting up Corrosion for testing and development follow the [Using Github Installation Instructions](documentation/Installation.md#using-github)

The p2 repository is not kept up to date with the master branch. Releases to the p2 repository will be made in more controlled released after the initial release of RedOx v1.
The p2 repository is not kept up to date with the master branch. Releases to the p2 repository will be made in more controlled released after the initial release of Corrosion v1.

## Concept

RedOx uses the [lsp4e](https://projects.eclipse.org/projects/technology.lsp4e) project to integrate with the [Rust Language Server](https://github.com/rust-lang-nursery/rls) and [TM4E](https://projects.eclipse.org/projects/technology.tm4e) project to provide syntax highlighting in order to provide a rich Rust editor in the Eclipse IDE.
Corrosion uses the [lsp4e](https://projects.eclipse.org/projects/technology.lsp4e) project to integrate with the [Rust Language Server](https://github.com/rust-lang-nursery/rls) and [TM4E](https://projects.eclipse.org/projects/technology.tm4e) project to provide syntax highlighting in order to provide a rich Rust editor in the Eclipse IDE.

The Rust and Cargo logos are owned by Mozilla and distributed under the terms of the [Creative Commons Attribution license (CC-BY)](https://creativecommons.org/licenses/by/4.0/). [More Info](https://www.rust-lang.org/en-US/legal.html)
20 changes: 10 additions & 10 deletions documentation/Installation.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
## Installing RedOx
## Installing Corrosion

### Using Eclipse Marketplace
Download [RedOx from the Eclipse Marketplace](https://marketplace.eclipse.org/content/redox-rust-edition-eclipse-ide)
Download [Corrosion from the Eclipse Marketplace](https://marketplace.eclipse.org/content/corrosion-rust-edition-eclipse-ide)
For further instructions on how to install using Eclipse Marketplace, see [their tutorial](https://marketplace.eclipse.org/marketplace-client-intro?mpc_install=3835145)

### Using p2 repository
The p2 site: https://lucasbullen.github.io/redOx/site/
The p2 site: https://lucasbullen.github.io/corrosion/site/
- Open Eclipse IDE
- Open the Install New Software Wizard (Under the Help menu)
- Enter https://lucasbullen.github.io/redOx/site/ in the site field
- Select RedOx - Rust in Eclipse IDE and click Next
- Enter https://lucasbullen.github.io/corrosion/site/ in the site field
- Select Corrosion - Rust in Eclipse IDE and click Next
- Wait for the dependencies to load
- Press Next again
- Accept the license and press Finish
Expand All @@ -18,15 +18,15 @@ The p2 site: https://lucasbullen.github.io/redOx/site/
### Using Github
##### For contributors and testers, This will allow running the plugin within a child Eclipse to test and develop new features
- Download [Eclipse for Eclipse Contributors](https://www.eclipse.org/downloads/packages/eclipse-ide-eclipse-committers/oxygen2) or any version of Eclipse with the `Eclipse Plug-in Development Environment` package
- Clone the repo: https://github.com/LucasBullen/redOx
- Clone the repo: https://github.com/LucasBullen/corrosion
- In the root of the repository, run `mvn clean verify` (You will need [Maven](http://maven.apache.org/))
- Open the following projects in Eclipse:
- org.eclipse.redox
- org.eclipse.corrosion
- target-platform
- org.eclipse.redox.tests (If you intend on contributing)
- org.eclipse.corrosion.tests (If you intend on contributing)
- Set the Target Platform
- Preferences > Plug-in Development > Target Platform
- Select the `redOx` target defininition
- Run the `org.eclipse.redox` project as an `Eclipse Application`
- Select the `corrosion` target defininition
- Run the `org.eclipse.corrosion` project as an `Eclipse Application`


Binary file removed images/redOx.png
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.redox.feature</name>
<name>org.eclipse.corrosion.feature</name>
<comment></comment>
<projects>
</projects>
Expand Down
File renamed without changes.
11 changes: 11 additions & 0 deletions org.eclipse.corrosion.feature/category.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.eclipse.corrosion.feature_0.1.0.qualifier.jar" id="org.eclipse.corrosion.feature" version="0.1.0.qualifier">
<category name="org.eclipse.corrosion.category"/>
</feature>
<category-def name="org.eclipse.corrosion.category" label="Corrosion: Rust edition in Eclipse IDE">
<description>
Corrosion enables Rust application development in the Eclipse IDE.
</description>
</category-def>
</site>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name=RedOx: Rust edition in Eclipse IDE
name=Corrosion: Rust edition in Eclipse IDE
description=Rust editor in Eclipse IDE. Relies on the Rust Language Server (RLS).
copyright=Copyright (c) 2017 Red Hat Inc. and others.\
\
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.redox.feature"
id="org.eclipse.corrosion.feature"
label="%name"
version="0.1.0.qualifier"
provider-name="Red Hat Inc."
Expand All @@ -20,7 +20,7 @@
</license>

<plugin
id="org.eclipse.redox"
id="org.eclipse.corrosion"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.redox.feature</artifactId>
<artifactId>org.eclipse.corrosion.feature</artifactId>
<parent>
<groupId>org.eclipse.redox</groupId>
<groupId>org.eclipse.corrosion</groupId>
<artifactId>parent</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.redox.tests</name>
<name>org.eclipse.corrosion.tests</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tests for RedOx
Bundle-SymbolicName: org.eclipse.redox.tests;singleton:=true
Bundle-Name: Tests for Corrosion
Bundle-SymbolicName: org.eclipse.corrosion.tests;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: Red Hat Inc.
Eclipse-BundleShape: dir
Automatic-Module-Name: org.eclipse.redox.tests
Require-Bundle: org.eclipse.redox;bundle-version="0.1.0",
Automatic-Module-Name: org.eclipse.corrosion.tests
Require-Bundle: org.eclipse.corrosion;bundle-version="0.1.0",
org.junit;bundle-version="4.11.0",
org.eclipse.core.runtime;bundle-version="3.13.0",
org.eclipse.core.resources;bundle-version="3.12.0",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.redox.tests</artifactId>
<artifactId>org.eclipse.corrosion.tests</artifactId>
<parent>
<groupId>org.eclipse.redox</groupId>
<groupId>org.eclipse.corrosion</groupId>
<artifactId>parent</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>
<packaging>eclipse-test-plugin</packaging>

<properties>
<testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.redox.tests.AllTests</testClass>
<testClass>org.eclipse.corrosion.tests.AllTests</testClass>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Mickael Istria (Red Hat Inc.) - Source Reference
* Lucas Bullen (Red Hat Inc.) - Initial implementation
*******************************************************************************/
package org.eclipse.redox.tests;
package org.eclipse.corrosion.tests;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -39,7 +39,7 @@
* Takes care of creating a temporary project and resource before test and to
* clean it up after.
*/
public class AbstractRedoxTest {
public class AbstractCorrosionTest {

private Map<String, IProject> provisionedProjects;

Expand All @@ -58,7 +58,7 @@ public void setUp() throws Exception {
* @throws CoreException
*/
protected IProject provisionProject(String projectName) throws IOException, CoreException {
URL url = FileLocator.find(Platform.getBundle("org.eclipse.redox.tests"),
URL url = FileLocator.find(Platform.getBundle("org.eclipse.corrosion.tests"),
Path.fromPortableString("projects/" + projectName), Collections.emptyMap());
url = FileLocator.toFileURL(url);
File folder = new File(url.getFile());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Lucas Bullen (Red Hat Inc.) - Initial implementation
*******************************************************************************/
package org.eclipse.redox.tests;
package org.eclipse.corrosion.tests;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Lucas Bullen (Red Hat Inc.) - Initial implementation
*******************************************************************************/
package org.eclipse.redox.tests;
package org.eclipse.corrosion.tests;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Expand All @@ -27,16 +27,16 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.redox.builder.AddCargoBuilder;
import org.eclipse.redox.builder.RemoveCargoBuilder;
import org.eclipse.redox.builder.TestCargoBuilderEnabled;
import org.eclipse.corrosion.builder.AddCargoBuilder;
import org.eclipse.corrosion.builder.RemoveCargoBuilder;
import org.eclipse.corrosion.builder.TestCargoBuilderEnabled;
import org.eclipse.ui.ISources;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.tests.harness.util.DisplayHelper;
import org.junit.Test;

public class TestBuilder extends AbstractRedoxTest {
public class TestBuilder extends AbstractCorrosionTest {

@Test
public void testBuild() throws Exception {
Expand All @@ -60,9 +60,9 @@ protected boolean condition() {
}

private static final ICommandService COMMAND_SERVICE = PlatformUI.getWorkbench().getService(ICommandService.class);
private static final Command ADD_COMMAND = COMMAND_SERVICE.getCommand("org.eclipse.redox.builder.AddCargoBuilder");
private static final Command ADD_COMMAND = COMMAND_SERVICE.getCommand("org.eclipse.corrosion.builder.AddCargoBuilder");
private static final Command REMOVE_COMMAND = COMMAND_SERVICE
.getCommand("org.eclipse.redox.builder.RemoveCargoBuilder");
.getCommand("org.eclipse.corrosion.builder.RemoveCargoBuilder");

private void addBuilder(IProject project) throws Exception {
IEvaluationContext evaluationContext = new EvaluationContext(null, project);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Lucas Bullen (Red Hat Inc.) - Initial implementation
*******************************************************************************/
package org.eclipse.redox.tests;
package org.eclipse.corrosion.tests;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Expand All @@ -20,16 +20,16 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.redox.wizards.export.CargoExportWizard;
import org.eclipse.redox.wizards.export.CargoExportWizardPage;
import org.eclipse.corrosion.wizards.export.CargoExportWizard;
import org.eclipse.corrosion.wizards.export.CargoExportWizardPage;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.tests.harness.util.DisplayHelper;
import org.junit.Test;

public class TestExportCargoProjectWizard extends AbstractRedoxTest {
public class TestExportCargoProjectWizard extends AbstractCorrosionTest {

private WizardDialog dialog;
private CargoExportWizard wizard;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Mickael Istria (Red Hat Inc.) - Source Reference
* Lucas Bullen (Red Hat Inc.) - Initial implementation
*******************************************************************************/
package org.eclipse.redox.tests;
package org.eclipse.corrosion.tests;

import java.io.IOException;

Expand All @@ -24,7 +24,7 @@
import org.junit.Assert;
import org.junit.Test;

public class TestIDEIntegration extends AbstractRedoxTest {
public class TestIDEIntegration extends AbstractCorrosionTest {

@Test
public void testRustEditorAssociation() throws IOException, CoreException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
* Contributors:
* Lucas Bullen (Red Hat Inc.) - Initial implementation
*******************************************************************************/
package org.eclipse.redox.tests;
package org.eclipse.corrosion.tests;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.redox.RLSClientImplementation;
import org.eclipse.corrosion.RLSClientImplementation;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.tests.harness.util.DisplayHelper;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Mickael Istria (Red Hat Inc.) - Source Reference
* Lucas Bullen (Red Hat Inc.) - Initial implementation
*******************************************************************************/
package org.eclipse.redox.tests;
package org.eclipse.corrosion.tests;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -40,7 +40,7 @@
import org.junit.Assert;
import org.junit.Test;

public class TestLSPIntegration extends AbstractRedoxTest {
public class TestLSPIntegration extends AbstractCorrosionTest {

@Test
public void testLSFound() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Contributors:
* Lucas Bullen (Red Hat Inc.) - Initial implementation
*******************************************************************************/
package org.eclipse.redox.tests;
package org.eclipse.corrosion.tests;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Expand All @@ -22,14 +22,14 @@
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.redox.wizards.newCargo.NewCargoProjectWizard;
import org.eclipse.redox.wizards.newCargo.NewCargoProjectWizardPage;
import org.eclipse.corrosion.wizards.newCargo.NewCargoProjectWizard;
import org.eclipse.corrosion.wizards.newCargo.NewCargoProjectWizardPage;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.tests.harness.util.DisplayHelper;
import org.junit.Test;

public class TestNewCargoProjectWizard extends AbstractRedoxTest {
public class TestNewCargoProjectWizard extends AbstractCorrosionTest {

@Test
public void testNewProjectPage() throws Exception {
Expand Down
Loading

0 comments on commit c2b13af

Please sign in to comment.