Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleanup of unneeded files and fixing documentation
  • Loading branch information
TimLethbridge committed Mar 22, 2016
1 parent bac3bdf commit 28eec18
Show file tree
Hide file tree
Showing 125 changed files with 32 additions and 12,104 deletions.
4 changes: 1 addition & 3 deletions CONTRIBUTING.md
Expand Up @@ -114,9 +114,7 @@ The umple project is split into many smaller subproject, the folder hierarchy is

* `UmpleToRuby` - Code generation for Ruby*

* `UmpleToRTCpp` - Code generation for Real-time C++ *

* `~~UmpleToCpp/~~` - Code generation for alternative C++ - historical; to be deleted
* `UmpleToRTCpp` - Code generation for C++ *

* `UmpleToSDL` - Code generation to convert Umple to SDL*

Expand Down
3 changes: 2 additions & 1 deletion LICENSE.md
Expand Up @@ -17,7 +17,8 @@ Jason Canto, Ellen Arteca, Alexi Turcotte, Karin Ng, Mark Galloway,
Alexander Ringeri, Antonio Maria Pereria de Resende, Craig Bryan, Eric Telmer,
Charles Wang, Chan Chun Kit, Nabil Maadarani, John Zweip, Kevin Brightwell,
Warren Marivel, Ashley Merman, Xinxin Kou, Aymen Ben Rkhis, Curtis Meerkerk, Adam Kereliuk,
Matthew Fritze
Matthew Fritze, Michael Mkicik, Victoria Lacroix, Morgan Redshaw, Matthew Rodusek,
Shikib Mehri

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
17 changes: 8 additions & 9 deletions README.md
Expand Up @@ -11,16 +11,16 @@ OS | Linux | OSX | Windows

This is the main project for various Umple subprojects and components.

Umple is a model-oriented programming technology. It allows developers to embed modelling concepts (e.g. UML associations, state machines), patterns and other abstractions in traditional code, and vice versa. It generates high quality code for Java, C++ and PhP (and can be embedded in or embed these), as well as diagrams, metrics and many other artifacts.
Umple is a model-oriented programming technology. It allows developers to embed modelling concepts (e.g. UML associations, state machines), patterns, generation templates, and other abstractions in traditional code, and vice versa. It generates high quality code for Java, C++ and PhP (and can be embedded in or embed these), as well as diagrams, metrics and many other artifacts.

The project homepage is located at http://umple.org/

##Development
Umple is developed in itself, guaranteeing robustness, the most recent version of the compiler must be used to compile itself. See the wiki for development setup.

Development follows a model-driven, test-driven, agile, continuous-integration process. Umple is hosted currently on Github at http://code.umple.org. It was first released in 2007, and the master was on Google Code from 2011 to 2015.
Development follows a model-driven, test-driven, agile, continuous-integration process. Umple is hosted currently on Github at http://code.umple.org. It was first released in 2007, and the master was on Google Code from 2011 to mid 2015.

Umple has been largely developed as a research project at the University of Ottawa, Canada, by numerous PhD and masters students, Many undergraduates from across Canada and the USA have also contributed. See the license file for the list of contributors.
Umple has been largely developed as a research project at the University of Ottawa, Canada, by numerous PhD and masters students, Many undergraduates from across Canada and the USA have also contributed through the UCOSP program. See the license file for the list of contributors.

More details can be found as follows

Expand All @@ -37,7 +37,7 @@ Umple is continuously tested and build at the University of Ottawa using CruiseC
The umple project is split into many smaller subproject, the folder hierarchy is explained below to better describe the structure.

* build/
* Ant build scripts and related information
* Ant build scripts and related information including user manual raw data

* cruise.umple/ *Umple compiler*
* See its own ReadMe.txt for further details
Expand Down Expand Up @@ -68,17 +68,16 @@ The umple project is split into many smaller subproject, the folder hierarchy is

* ExternalTextEditorPlugins *Plugins for external editors, Notepad++, etc*

* sandbox *What is this?*
* sandbox *Small test done before a build to make sure testing and compiling works*

* testbed/, testbed_php/, testbed_ruby/ *Test suites for Java, Php and Ruby respectively*
* UmpleToJava/ *Code generation for Java*
* UmpleToPhp/ *Code generation for Php*
* UmpleToRuby/ *Code generation for Ruby*
* UmpleToRTCpp/ *Code generation for Real-time C++ *
* ~~UmpleToCpp/~~ *Code generation for alternative C++ - historical; to be deleted
* UmpleToSDL/ *Code generation to convert Umple to SDL*
* UmpleToRTCpp/ *Code generation for C++ *
* UmpleToSDL/ *Code generation to convert Umple to SDL* (in early development)
* UmpleToSql/ *Code generation SQL from Umple models*
* UmpleToTemplate/ *Template for creating new code generation subprojects*
* UmpleToTemplate/ *Location for templates that could be common to subprojects*

* umpleonline/ *The UmpleOnline web application*
* UmpleOnline allows generation of code from Umple directly in a web browser, and also editing of Umple both graphically and textually. Available at http://try.umple.org
Expand Down
10 changes: 10 additions & 0 deletions UmpleToTemplate/README.md
Expand Up @@ -7,3 +7,13 @@ As of the time of writing there are no common templates as we are in the process
to UmpleTL. Any common UmpleTL templates should be put in the UmpleTLTemplates directory if they are
ever created. Any jet templates will be removed.

The templates that might be considerd putting back here include

* association_Get_All
* association_Set_All
* attribute_Get_All
* attribute_IsBoolean_All
* attribute_Set_All
* state_machine_Events_All
* state_machine_Get_All
* state_machine_Set_All
50 changes: 0 additions & 50 deletions UmpleToTemplate/templates/association_Get_All.jet

This file was deleted.

0 comments on commit 28eec18

Please sign in to comment.